diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index be754287..ccbb09e2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -41,5 +41,5 @@ jobs: # run: dotnet nuget push ./src/Lumina/bin/Release/*.nupkg -k ${{ secrets.GITHUB_TOKEN }} -s https://nuget.pkg.github.com/NotAdam/index.json --skip-duplicate - name: publish nuget package # for some cursed reason this fails on windows ??????????? - if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' && matrix.os == 'ubuntu-latest' }} + if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/preview' && matrix.os == 'ubuntu-latest' }} run: dotnet nuget push ./src/Lumina/bin/Release/*.nupkg -k ${{ secrets.NUGET_API_KEY }} -s https://api.nuget.org/v3/index.json --skip-duplicate diff --git a/src/.idea/.idea.Lumina/.idea/indexLayout.xml b/src/.idea/.idea.Lumina/.idea/indexLayout.xml index 27ba142e..7b08163c 100644 --- a/src/.idea/.idea.Lumina/.idea/indexLayout.xml +++ b/src/.idea/.idea.Lumina/.idea/indexLayout.xml @@ -1,6 +1,6 @@ - + diff --git a/src/.idea/.idea.Lumina/.idea/modules.xml b/src/.idea/.idea.Lumina/.idea/modules.xml deleted file mode 100644 index 91214ae2..00000000 --- a/src/.idea/.idea.Lumina/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/.idea/.idea.Lumina/.idea/riderModule.iml b/src/.idea/.idea.Lumina/.idea/riderModule.iml deleted file mode 100644 index 67c476b9..00000000 --- a/src/.idea/.idea.Lumina/.idea/riderModule.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/src/.idea/.idea.Lumina/riderModule.iml b/src/.idea/.idea.Lumina/riderModule.iml deleted file mode 100644 index f92f9da9..00000000 --- a/src/.idea/.idea.Lumina/riderModule.iml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Lumina.Cmd/Commands/ExcelUpdate.cs b/src/Lumina.Cmd/Commands/ExcelUpdate.cs index e4e54404..a52e8aa9 100644 --- a/src/Lumina.Cmd/Commands/ExcelUpdate.cs +++ b/src/Lumina.Cmd/Commands/ExcelUpdate.cs @@ -1,13 +1,9 @@ -using System; using System.Diagnostics; using System.Linq; -using System.Runtime.CompilerServices; -using System.Text; using System.Threading.Tasks; using CliFx; using CliFx.Attributes; using Lumina.Data.Files.Excel; -using Lumina.Data.Structs.Excel; namespace Lumina.Cmd.Commands { @@ -25,8 +21,8 @@ public class ExcelUpdate : ICommand public ValueTask ExecuteAsync( IConsole console ) { var co = console.Output; - var ol = new Lumina( OldPath ); - var nl = new Lumina( NewPath ); + var ol = new GameData( OldPath ); + var nl = new GameData( NewPath ); co.WriteLine( $"old sheets: {ol.Excel.SheetNames.Count} new sheets: {nl.Excel.SheetNames.Count}" ); diff --git a/src/Lumina.Cmd/Commands/FileDiff.cs b/src/Lumina.Cmd/Commands/FileDiff.cs index e2d82437..78d32392 100644 --- a/src/Lumina.Cmd/Commands/FileDiff.cs +++ b/src/Lumina.Cmd/Commands/FileDiff.cs @@ -1,5 +1,4 @@ using System.IO; -using System.Linq; using System.Threading.Tasks; using CliFx; using CliFx.Attributes; @@ -28,8 +27,8 @@ public ValueTask ExecuteAsync( IConsole console ) CacheFileResources = false }; - var ol = new Lumina( Path, opts ); - var nl = new Lumina( NewPath, opts ); + var ol = new GameData( Path, opts ); + var nl = new GameData( NewPath, opts ); if( !File.Exists( PathsFile ) ) { diff --git a/src/Lumina.Cmd/Commands/FileExtract.cs b/src/Lumina.Cmd/Commands/FileExtract.cs index aa2f588b..c3b9e295 100644 --- a/src/Lumina.Cmd/Commands/FileExtract.cs +++ b/src/Lumina.Cmd/Commands/FileExtract.cs @@ -22,7 +22,7 @@ public class FileExtract : ICommand public ValueTask ExecuteAsync( IConsole console ) { - var lumina = new Lumina( Path ); + var lumina = new GameData( Path ); var file = lumina.GetFile( FilePath ); diff --git a/src/Lumina.Cmd/Commands/FileInfo.cs b/src/Lumina.Cmd/Commands/FileInfo.cs index 62e8d187..c2952418 100644 --- a/src/Lumina.Cmd/Commands/FileInfo.cs +++ b/src/Lumina.Cmd/Commands/FileInfo.cs @@ -1,13 +1,10 @@ -using System.Drawing; using System.IO; -using System.Linq; using System.Threading.Tasks; using CliFx; using CliFx.Attributes; using Lumina.Data; using Lumina.Data.Files; using Lumina.Data.Files.Excel; -using Pastel; namespace Lumina.Cmd.Commands { @@ -23,32 +20,32 @@ public class FileInfo : ICommand EnvironmentVariableName = "LUMINA_CMD_CLIENT_PATH" )] public string DataPath { get; set; } - private FileResource LoadResource( Lumina lumina, string path ) + private FileResource LoadResource( GameData gameData, string path ) { var ext = Path.GetExtension( path ); switch( ext ) { case ".exh": - return lumina.GetFile< ExcelHeaderFile >( path ); + return gameData.GetFile< ExcelHeaderFile >( path ); case ".exd": - return lumina.GetFile< ExcelDataFile >( path ); + return gameData.GetFile< ExcelDataFile >( path ); case ".exl": - return lumina.GetFile< ExcelListFile >( path ); + return gameData.GetFile< ExcelListFile >( path ); case ".imc": - return lumina.GetFile< ImcFile >( path ); + return gameData.GetFile< ImcFile >( path ); case ".lgb": - return lumina.GetFile< LgbFile >( path ); + return gameData.GetFile< LgbFile >( path ); case ".tex": - return lumina.GetFile< TexFile >( path ); + return gameData.GetFile< TexFile >( path ); case ".hwc": - return lumina.GetFile< HwcFile >( path ); + return gameData.GetFile< HwcFile >( path ); } return null; @@ -56,7 +53,7 @@ private FileResource LoadResource( Lumina lumina, string path ) public ValueTask ExecuteAsync( IConsole console ) { - var lumina = new Lumina( DataPath ); + var lumina = new GameData( DataPath ); var file = LoadResource( lumina, FilePath ); diff --git a/src/Lumina.Cmd/Commands/Repo.cs b/src/Lumina.Cmd/Commands/Repo.cs index 167c4d68..42c5a9eb 100644 --- a/src/Lumina.Cmd/Commands/Repo.cs +++ b/src/Lumina.Cmd/Commands/Repo.cs @@ -1,13 +1,8 @@ -using System.Drawing; -using System.IO; using System.Linq; using System.Threading.Tasks; using CliFx; using CliFx.Attributes; using Lumina.Data; -using Lumina.Data.Files; -using Lumina.Data.Files.Excel; -using Pastel; namespace Lumina.Cmd.Commands { @@ -22,7 +17,7 @@ public class Repo : ICommand public ValueTask ExecuteAsync( IConsole console ) { - var lumina = new Lumina( DataPath ); + var lumina = new GameData( DataPath ); var totalFiles = 0; diff --git a/src/Lumina.Cmd/Program.cs b/src/Lumina.Cmd/Program.cs index b6807a1e..16a50992 100644 --- a/src/Lumina.Cmd/Program.cs +++ b/src/Lumina.Cmd/Program.cs @@ -1,5 +1,4 @@ -using System; -using System.Threading.Tasks; +using System.Threading.Tasks; using CliFx; namespace Lumina.Cmd diff --git a/src/Lumina.Example/Condition.cs b/src/Lumina.Example/Condition.cs index a360c829..450bc8bd 100644 --- a/src/Lumina.Example/Condition.cs +++ b/src/Lumina.Example/Condition.cs @@ -3,27 +3,23 @@ namespace Lumina.Example { - [Sheet("Condition" )] - public class Condition : IExcelRow + [Sheet( "Condition" )] + public class Condition : ExcelRow { public int Index; public uint LogMessageId; - + public LazyRow< LogMessage > LogMessage; - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Index = parser.ReadColumn< int >( 0 ); - + LogMessageId = parser.ReadColumn< uint >( 2 ); - LogMessage = new LazyRow< LogMessage >( lumina, LogMessageId, language ); + LogMessage = new LazyRow< LogMessage >( gameData, LogMessageId, language ); } } } \ No newline at end of file diff --git a/src/Lumina.Example/LogMessage.cs b/src/Lumina.Example/LogMessage.cs index c49bf502..383794ce 100644 --- a/src/Lumina.Example/LogMessage.cs +++ b/src/Lumina.Example/LogMessage.cs @@ -1,21 +1,16 @@ using Lumina.Data; using Lumina.Excel; -using Lumina.Text; namespace Lumina.Example { [Sheet( "LogMessage" )] - public class LogMessage : IExcelRow + public class LogMessage : ExcelRow { - public uint RowId { get; set; } - public uint SubRowId { get; set; } - public string Text; - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Text = parser.ReadColumn< string >( 4 ); } diff --git a/src/Lumina.Example/Program.cs b/src/Lumina.Example/Program.cs index ee2978e2..88a3b7c3 100644 --- a/src/Lumina.Example/Program.cs +++ b/src/Lumina.Example/Program.cs @@ -3,9 +3,6 @@ using System.IO; using System.Linq; using System.Threading; -using System.Threading.Tasks; -using Lumina.Data; -using Lumina.Excel; using Lumina.Excel.GeneratedSheets; namespace Lumina.Example @@ -60,7 +57,7 @@ public override void SaveFile( string path ) static void Main( string[] args ) { - var lumina = new Lumina( args[ 0 ] ); + var lumina = new GameData( args[ 0 ] ); bool exitThread = false; var handleThread = new Thread( () => diff --git a/src/Lumina.Excel/GeneratedSheets/AOZArrangement.cs b/src/Lumina.Excel/GeneratedSheets/AOZArrangement.cs index fdf92b94..e42a6095 100644 --- a/src/Lumina.Excel/GeneratedSheets/AOZArrangement.cs +++ b/src/Lumina.Excel/GeneratedSheets/AOZArrangement.cs @@ -7,22 +7,18 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "AOZArrangement", columnHash: 0x2020acf6 )] - public class AOZArrangement : IExcelRow + public class AOZArrangement : ExcelRow { - public LazyRow< AOZContentBriefingBNpc > AOZContentBriefingBNpc; - public ushort Unknown1; + public LazyRow< AOZContentBriefingBNpc > AOZContentBriefingBNpc { get; set; } + public ushort Position { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - AOZContentBriefingBNpc = new LazyRow< AOZContentBriefingBNpc >( lumina, parser.ReadColumn< ushort >( 0 ), language ); - Unknown1 = parser.ReadColumn< ushort >( 1 ); + AOZContentBriefingBNpc = new LazyRow< AOZContentBriefingBNpc >( gameData, parser.ReadColumn< ushort >( 0 ), language ); + Position = parser.ReadColumn< ushort >( 1 ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/AOZBoss.cs b/src/Lumina.Excel/GeneratedSheets/AOZBoss.cs index 0e05adfe..4b0e25e7 100644 --- a/src/Lumina.Excel/GeneratedSheets/AOZBoss.cs +++ b/src/Lumina.Excel/GeneratedSheets/AOZBoss.cs @@ -7,22 +7,18 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "AOZBoss", columnHash: 0x2020acf6 )] - public class AOZBoss : IExcelRow + public class AOZBoss : ExcelRow { - public LazyRow< AOZContentBriefingBNpc > Boss; - public ushort Unknown1; + public LazyRow< AOZContentBriefingBNpc > Boss { get; set; } + public ushort Position { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Boss = new LazyRow< AOZContentBriefingBNpc >( lumina, parser.ReadColumn< ushort >( 0 ), language ); - Unknown1 = parser.ReadColumn< ushort >( 1 ); + Boss = new LazyRow< AOZContentBriefingBNpc >( gameData, parser.ReadColumn< ushort >( 0 ), language ); + Position = parser.ReadColumn< ushort >( 1 ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/AOZContent.cs b/src/Lumina.Excel/GeneratedSheets/AOZContent.cs index 7fcc0e02..65e940c3 100644 --- a/src/Lumina.Excel/GeneratedSheets/AOZContent.cs +++ b/src/Lumina.Excel/GeneratedSheets/AOZContent.cs @@ -7,33 +7,29 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "AOZContent", columnHash: 0x615a9876 )] - public class AOZContent : IExcelRow + public class AOZContent : ExcelRow { - public ushort StandardFinishTime; - public ushort IdealFinishTime; - public byte Act1FightType; - public ushort Act1; - public byte ArenaType1; - public byte Act2FightType; - public ushort Act2; - public byte ArenaType2; - public byte Act3FightType; - public ushort Act3; - public byte ArenaType3; - public uint ContentEntry; - public byte Order; - public ushort GilReward; - public ushort AlliedSealsReward; - public ushort TomestonesReward; + public ushort StandardFinishTime { get; set; } + public ushort IdealFinishTime { get; set; } + public byte Act1FightType { get; set; } + public ushort Act1 { get; set; } + public byte ArenaType1 { get; set; } + public byte Act2FightType { get; set; } + public ushort Act2 { get; set; } + public byte ArenaType2 { get; set; } + public byte Act3FightType { get; set; } + public ushort Act3 { get; set; } + public byte ArenaType3 { get; set; } + public uint ContentEntry { get; set; } + public byte Order { get; set; } + public ushort GilReward { get; set; } + public ushort AlliedSealsReward { get; set; } + public ushort TomestonesReward { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); StandardFinishTime = parser.ReadColumn< ushort >( 0 ); IdealFinishTime = parser.ReadColumn< ushort >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/AOZContentBriefingBNpc.cs b/src/Lumina.Excel/GeneratedSheets/AOZContentBriefingBNpc.cs index f805368b..6724b1ec 100644 --- a/src/Lumina.Excel/GeneratedSheets/AOZContentBriefingBNpc.cs +++ b/src/Lumina.Excel/GeneratedSheets/AOZContentBriefingBNpc.cs @@ -7,47 +7,43 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "AOZContentBriefingBNpc", columnHash: 0xfc0810d7 )] - public class AOZContentBriefingBNpc : IExcelRow + public class AOZContentBriefingBNpc : ExcelRow { - public LazyRow< BNpcName > BNpcName; - public uint TargetSmall; - public uint TargetLarge; - public bool Unknown3; - public byte Endurance; - public byte Fire; - public byte Ice; - public byte Wind; - public byte Earth; - public byte Thunder; - public byte Water; - public byte Slashing; - public byte Piercing; - public byte Blunt; - public byte Magic; - public bool SlowResistance; - public bool PetrificationResistance; - public bool ParalysisResistance; - public bool SilenceResistance; - public bool BlindResistance; - public bool StunResistance; - public bool SleepResistance; - public bool BindResistance; - public bool HeavyResistance; - public bool InstaDeathResistance; + public LazyRow< BNpcName > BNpcName { get; set; } + public uint TargetSmall { get; set; } + public uint TargetLarge { get; set; } + public bool HideStats { get; set; } + public byte Endurance { get; set; } + public byte Fire { get; set; } + public byte Ice { get; set; } + public byte Wind { get; set; } + public byte Earth { get; set; } + public byte Thunder { get; set; } + public byte Water { get; set; } + public byte Slashing { get; set; } + public byte Piercing { get; set; } + public byte Blunt { get; set; } + public byte Magic { get; set; } + public bool SlowVuln { get; set; } + public bool PetrificationVuln { get; set; } + public bool ParalysisVuln { get; set; } + public bool InterruptionVuln { get; set; } + public bool BlindVuln { get; set; } + public bool StunVuln { get; set; } + public bool SleepVuln { get; set; } + public bool BindVuln { get; set; } + public bool HeavyVuln { get; set; } + public bool FlatOrDeathVuln { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - BNpcName = new LazyRow< BNpcName >( lumina, parser.ReadColumn< uint >( 0 ), language ); + BNpcName = new LazyRow< BNpcName >( gameData, parser.ReadColumn< uint >( 0 ), language ); TargetSmall = parser.ReadColumn< uint >( 1 ); TargetLarge = parser.ReadColumn< uint >( 2 ); - Unknown3 = parser.ReadColumn< bool >( 3 ); + HideStats = parser.ReadColumn< bool >( 3 ); Endurance = parser.ReadColumn< byte >( 4 ); Fire = parser.ReadColumn< byte >( 5 ); Ice = parser.ReadColumn< byte >( 6 ); @@ -59,16 +55,16 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) Piercing = parser.ReadColumn< byte >( 12 ); Blunt = parser.ReadColumn< byte >( 13 ); Magic = parser.ReadColumn< byte >( 14 ); - SlowResistance = parser.ReadColumn< bool >( 15 ); - PetrificationResistance = parser.ReadColumn< bool >( 16 ); - ParalysisResistance = parser.ReadColumn< bool >( 17 ); - SilenceResistance = parser.ReadColumn< bool >( 18 ); - BlindResistance = parser.ReadColumn< bool >( 19 ); - StunResistance = parser.ReadColumn< bool >( 20 ); - SleepResistance = parser.ReadColumn< bool >( 21 ); - BindResistance = parser.ReadColumn< bool >( 22 ); - HeavyResistance = parser.ReadColumn< bool >( 23 ); - InstaDeathResistance = parser.ReadColumn< bool >( 24 ); + SlowVuln = parser.ReadColumn< bool >( 15 ); + PetrificationVuln = parser.ReadColumn< bool >( 16 ); + ParalysisVuln = parser.ReadColumn< bool >( 17 ); + InterruptionVuln = parser.ReadColumn< bool >( 18 ); + BlindVuln = parser.ReadColumn< bool >( 19 ); + StunVuln = parser.ReadColumn< bool >( 20 ); + SleepVuln = parser.ReadColumn< bool >( 21 ); + BindVuln = parser.ReadColumn< bool >( 22 ); + HeavyVuln = parser.ReadColumn< bool >( 23 ); + FlatOrDeathVuln = parser.ReadColumn< bool >( 24 ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/AOZReport.cs b/src/Lumina.Excel/GeneratedSheets/AOZReport.cs index b84ca67d..df3d41f1 100644 --- a/src/Lumina.Excel/GeneratedSheets/AOZReport.cs +++ b/src/Lumina.Excel/GeneratedSheets/AOZReport.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "AOZReport", columnHash: 0x1a97b0af )] - public class AOZReport : IExcelRow + public class AOZReport : ExcelRow { - public uint Unknown0; - public byte Reward; - public sbyte Order; + public uint Unknown0 { get; set; } + public byte Reward { get; set; } + public sbyte Order { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< uint >( 0 ); Reward = parser.ReadColumn< byte >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/Achievement.cs b/src/Lumina.Excel/GeneratedSheets/Achievement.cs index 0acf1f96..d82497f4 100644 --- a/src/Lumina.Excel/GeneratedSheets/Achievement.cs +++ b/src/Lumina.Excel/GeneratedSheets/Achievement.cs @@ -7,38 +7,34 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Achievement", columnHash: 0x24bfffd6 )] - public class Achievement : IExcelRow + public class Achievement : ExcelRow { - public LazyRow< AchievementCategory > AchievementCategory; - public SeString Name; - public SeString Description; - public byte Points; - public LazyRow< Title > Title; - public LazyRow< Item > Item; - public ushort Icon; - public byte Unknown7; - public byte Type; - public int Key; - public int[] Data; - public ushort Order; - public byte Unknown19; - public LazyRow< AchievementHideCondition > AchievementHideCondition; + public LazyRow< AchievementCategory > AchievementCategory { get; set; } + public SeString Name { get; set; } + public SeString Description { get; set; } + public byte Points { get; set; } + public LazyRow< Title > Title { get; set; } + public LazyRow< Item > Item { get; set; } + public ushort Icon { get; set; } + public byte Unknown7 { get; set; } + public byte Type { get; set; } + public int Key { get; set; } + public int[] Data { get; set; } + public ushort Order { get; set; } + public byte Unknown19 { get; set; } + public LazyRow< AchievementHideCondition > AchievementHideCondition { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - AchievementCategory = new LazyRow< AchievementCategory >( lumina, parser.ReadColumn< byte >( 0 ), language ); + AchievementCategory = new LazyRow< AchievementCategory >( gameData, parser.ReadColumn< byte >( 0 ), language ); Name = parser.ReadColumn< SeString >( 1 ); Description = parser.ReadColumn< SeString >( 2 ); Points = parser.ReadColumn< byte >( 3 ); - Title = new LazyRow< Title >( lumina, parser.ReadColumn< ushort >( 4 ), language ); - Item = new LazyRow< Item >( lumina, parser.ReadColumn< uint >( 5 ), language ); + Title = new LazyRow< Title >( gameData, parser.ReadColumn< ushort >( 4 ), language ); + Item = new LazyRow< Item >( gameData, parser.ReadColumn< uint >( 5 ), language ); Icon = parser.ReadColumn< ushort >( 6 ); Unknown7 = parser.ReadColumn< byte >( 7 ); Type = parser.ReadColumn< byte >( 8 ); @@ -48,7 +44,7 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) Data[ i ] = parser.ReadColumn< int >( 10 + i ); Order = parser.ReadColumn< ushort >( 18 ); Unknown19 = parser.ReadColumn< byte >( 19 ); - AchievementHideCondition = new LazyRow< AchievementHideCondition >( lumina, parser.ReadColumn< byte >( 20 ), language ); + AchievementHideCondition = new LazyRow< AchievementHideCondition >( gameData, parser.ReadColumn< byte >( 20 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/AchievementCategory.cs b/src/Lumina.Excel/GeneratedSheets/AchievementCategory.cs index 9e355062..1712cdbe 100644 --- a/src/Lumina.Excel/GeneratedSheets/AchievementCategory.cs +++ b/src/Lumina.Excel/GeneratedSheets/AchievementCategory.cs @@ -7,25 +7,21 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "AchievementCategory", columnHash: 0xb98d9baf )] - public class AchievementCategory : IExcelRow + public class AchievementCategory : ExcelRow { - public SeString Name; - public LazyRow< AchievementKind > AchievementKind; - public bool ShowComplete; - public bool HideCategory; - public byte Order; + public SeString Name { get; set; } + public LazyRow< AchievementKind > AchievementKind { get; set; } + public bool ShowComplete { get; set; } + public bool HideCategory { get; set; } + public byte Order { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); - AchievementKind = new LazyRow< AchievementKind >( lumina, parser.ReadColumn< byte >( 1 ), language ); + AchievementKind = new LazyRow< AchievementKind >( gameData, parser.ReadColumn< byte >( 1 ), language ); ShowComplete = parser.ReadColumn< bool >( 2 ); HideCategory = parser.ReadColumn< bool >( 3 ); Order = parser.ReadColumn< byte >( 4 ); diff --git a/src/Lumina.Excel/GeneratedSheets/AchievementHideCondition.cs b/src/Lumina.Excel/GeneratedSheets/AchievementHideCondition.cs index 0ec2d849..258f9f06 100644 --- a/src/Lumina.Excel/GeneratedSheets/AchievementHideCondition.cs +++ b/src/Lumina.Excel/GeneratedSheets/AchievementHideCondition.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "AchievementHideCondition", columnHash: 0x824c4ccf )] - public class AchievementHideCondition : IExcelRow + public class AchievementHideCondition : ExcelRow { - public bool HideAchievement; - public bool HideName; - public bool HideConditions; + public bool HideAchievement { get; set; } + public bool HideName { get; set; } + public bool HideConditions { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); HideAchievement = parser.ReadColumn< bool >( 0 ); HideName = parser.ReadColumn< bool >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/AchievementKind.cs b/src/Lumina.Excel/GeneratedSheets/AchievementKind.cs index 458e2a45..4084dda1 100644 --- a/src/Lumina.Excel/GeneratedSheets/AchievementKind.cs +++ b/src/Lumina.Excel/GeneratedSheets/AchievementKind.cs @@ -7,19 +7,15 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "AchievementKind", columnHash: 0x9ff65ad6 )] - public class AchievementKind : IExcelRow + public class AchievementKind : ExcelRow { - public SeString Name; - public byte Order; + public SeString Name { get; set; } + public byte Order { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); Order = parser.ReadColumn< byte >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/Action.cs b/src/Lumina.Excel/GeneratedSheets/Action.cs index 50fa85ff..00ad9165 100644 --- a/src/Lumina.Excel/GeneratedSheets/Action.cs +++ b/src/Lumina.Excel/GeneratedSheets/Action.cs @@ -7,95 +7,91 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Action", columnHash: 0xb3773db1 )] - public class Action : IExcelRow + public class Action : ExcelRow { - public SeString Name; - public bool Unknown1; - public ushort Icon; - public LazyRow< ActionCategory > ActionCategory; - public byte Unknown4; - public LazyRow< ActionCastTimeline > AnimationStart; - public LazyRow< ActionCastVFX > VFX; - public LazyRow< ActionTimeline > AnimationEnd; - public LazyRow< ActionTimeline > ActionTimelineHit; - public byte Unknown9; - public LazyRow< ClassJob > ClassJob; - public byte BehaviourType; - public byte ClassJobLevel; - public bool IsRoleAction; - public sbyte Range; - public bool CanTargetSelf; - public bool CanTargetParty; - public bool CanTargetFriendly; - public bool CanTargetHostile; - public bool Unknown19; - public bool Unknown20; - public bool TargetArea; - public bool Unknown22; - public bool Unknown23; - public sbyte Unknown24; - public bool CanTargetDead; - public bool Unknown26; - public byte CastType; - public byte EffectRange; - public byte XAxisModifier; - public bool Unknown30; - public byte PrimaryCostType; - public ushort PrimaryCostValue; - public byte SecondaryCostType; - public ushort SecondaryCostValue; - public LazyRow< Action > ActionCombo; - public bool PreservesCombo; - public ushort Cast100ms; - public ushort Recast100ms; - public byte CooldownGroup; - public byte Unknown40; - public byte MaxCharges; - public LazyRow< AttackType > AttackType; - public byte Aspect; - public LazyRow< ActionProcStatus > ActionProcStatus; - public byte Unknown45; - public LazyRow< Status > StatusGainSelf; - public uint UnlockLink; - public LazyRow< ClassJobCategory > ClassJobCategory; - public byte Unknown49; - public bool Unknown50; - public bool AffectsPosition; - public LazyRow< Omen > Omen; - public bool IsPvP; - public bool Unknown54; - public bool Unknown55; - public bool Unknown56; - public bool Unknown57; - public bool Unknown58; - public bool Unknown59; - public bool Unknown60; - public bool Unknown61; - public byte Unknown62; - public bool Unknown63; - public bool Unknown64; - public bool IsPlayerAction; + public SeString Name { get; set; } + public bool Unknown1 { get; set; } + public ushort Icon { get; set; } + public LazyRow< ActionCategory > ActionCategory { get; set; } + public byte Unknown4 { get; set; } + public LazyRow< ActionCastTimeline > AnimationStart { get; set; } + public LazyRow< ActionCastVFX > VFX { get; set; } + public LazyRow< ActionTimeline > AnimationEnd { get; set; } + public LazyRow< ActionTimeline > ActionTimelineHit { get; set; } + public byte Unknown9 { get; set; } + public LazyRow< ClassJob > ClassJob { get; set; } + public byte BehaviourType { get; set; } + public byte ClassJobLevel { get; set; } + public bool IsRoleAction { get; set; } + public sbyte Range { get; set; } + public bool CanTargetSelf { get; set; } + public bool CanTargetParty { get; set; } + public bool CanTargetFriendly { get; set; } + public bool CanTargetHostile { get; set; } + public bool Unknown19 { get; set; } + public bool Unknown20 { get; set; } + public bool TargetArea { get; set; } + public bool Unknown22 { get; set; } + public bool Unknown23 { get; set; } + public sbyte Unknown24 { get; set; } + public bool CanTargetDead { get; set; } + public bool Unknown26 { get; set; } + public byte CastType { get; set; } + public byte EffectRange { get; set; } + public byte XAxisModifier { get; set; } + public bool Unknown30 { get; set; } + public byte PrimaryCostType { get; set; } + public ushort PrimaryCostValue { get; set; } + public byte SecondaryCostType { get; set; } + public ushort SecondaryCostValue { get; set; } + public LazyRow< Action > ActionCombo { get; set; } + public bool PreservesCombo { get; set; } + public ushort Cast100ms { get; set; } + public ushort Recast100ms { get; set; } + public byte CooldownGroup { get; set; } + public byte Unknown40 { get; set; } + public byte MaxCharges { get; set; } + public LazyRow< AttackType > AttackType { get; set; } + public byte Aspect { get; set; } + public LazyRow< ActionProcStatus > ActionProcStatus { get; set; } + public byte Unknown45 { get; set; } + public LazyRow< Status > StatusGainSelf { get; set; } + public uint UnlockLink { get; set; } + public LazyRow< ClassJobCategory > ClassJobCategory { get; set; } + public byte Unknown49 { get; set; } + public bool Unknown50 { get; set; } + public bool AffectsPosition { get; set; } + public LazyRow< Omen > Omen { get; set; } + public bool IsPvP { get; set; } + public bool Unknown54 { get; set; } + public bool Unknown55 { get; set; } + public bool Unknown56 { get; set; } + public bool Unknown57 { get; set; } + public bool Unknown58 { get; set; } + public bool Unknown59 { get; set; } + public bool Unknown60 { get; set; } + public bool Unknown61 { get; set; } + public byte Unknown62 { get; set; } + public bool Unknown63 { get; set; } + public bool Unknown64 { get; set; } + public bool IsPlayerAction { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); Unknown1 = parser.ReadColumn< bool >( 1 ); Icon = parser.ReadColumn< ushort >( 2 ); - ActionCategory = new LazyRow< ActionCategory >( lumina, parser.ReadColumn< byte >( 3 ), language ); + ActionCategory = new LazyRow< ActionCategory >( gameData, parser.ReadColumn< byte >( 3 ), language ); Unknown4 = parser.ReadColumn< byte >( 4 ); - AnimationStart = new LazyRow< ActionCastTimeline >( lumina, parser.ReadColumn< byte >( 5 ), language ); - VFX = new LazyRow< ActionCastVFX >( lumina, parser.ReadColumn< byte >( 6 ), language ); - AnimationEnd = new LazyRow< ActionTimeline >( lumina, parser.ReadColumn< short >( 7 ), language ); - ActionTimelineHit = new LazyRow< ActionTimeline >( lumina, parser.ReadColumn< ushort >( 8 ), language ); + AnimationStart = new LazyRow< ActionCastTimeline >( gameData, parser.ReadColumn< byte >( 5 ), language ); + VFX = new LazyRow< ActionCastVFX >( gameData, parser.ReadColumn< byte >( 6 ), language ); + AnimationEnd = new LazyRow< ActionTimeline >( gameData, parser.ReadColumn< short >( 7 ), language ); + ActionTimelineHit = new LazyRow< ActionTimeline >( gameData, parser.ReadColumn< ushort >( 8 ), language ); Unknown9 = parser.ReadColumn< byte >( 9 ); - ClassJob = new LazyRow< ClassJob >( lumina, parser.ReadColumn< sbyte >( 10 ), language ); + ClassJob = new LazyRow< ClassJob >( gameData, parser.ReadColumn< sbyte >( 10 ), language ); BehaviourType = parser.ReadColumn< byte >( 11 ); ClassJobLevel = parser.ReadColumn< byte >( 12 ); IsRoleAction = parser.ReadColumn< bool >( 13 ); @@ -120,24 +116,24 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) PrimaryCostValue = parser.ReadColumn< ushort >( 32 ); SecondaryCostType = parser.ReadColumn< byte >( 33 ); SecondaryCostValue = parser.ReadColumn< ushort >( 34 ); - ActionCombo = new LazyRow< Action >( lumina, parser.ReadColumn< ushort >( 35 ), language ); + ActionCombo = new LazyRow< Action >( gameData, parser.ReadColumn< ushort >( 35 ), language ); PreservesCombo = parser.ReadColumn< bool >( 36 ); Cast100ms = parser.ReadColumn< ushort >( 37 ); Recast100ms = parser.ReadColumn< ushort >( 38 ); CooldownGroup = parser.ReadColumn< byte >( 39 ); Unknown40 = parser.ReadColumn< byte >( 40 ); MaxCharges = parser.ReadColumn< byte >( 41 ); - AttackType = new LazyRow< AttackType >( lumina, parser.ReadColumn< sbyte >( 42 ), language ); + AttackType = new LazyRow< AttackType >( gameData, parser.ReadColumn< sbyte >( 42 ), language ); Aspect = parser.ReadColumn< byte >( 43 ); - ActionProcStatus = new LazyRow< ActionProcStatus >( lumina, parser.ReadColumn< byte >( 44 ), language ); + ActionProcStatus = new LazyRow< ActionProcStatus >( gameData, parser.ReadColumn< byte >( 44 ), language ); Unknown45 = parser.ReadColumn< byte >( 45 ); - StatusGainSelf = new LazyRow< Status >( lumina, parser.ReadColumn< ushort >( 46 ), language ); + StatusGainSelf = new LazyRow< Status >( gameData, parser.ReadColumn< ushort >( 46 ), language ); UnlockLink = parser.ReadColumn< uint >( 47 ); - ClassJobCategory = new LazyRow< ClassJobCategory >( lumina, parser.ReadColumn< byte >( 48 ), language ); + ClassJobCategory = new LazyRow< ClassJobCategory >( gameData, parser.ReadColumn< byte >( 48 ), language ); Unknown49 = parser.ReadColumn< byte >( 49 ); Unknown50 = parser.ReadColumn< bool >( 50 ); AffectsPosition = parser.ReadColumn< bool >( 51 ); - Omen = new LazyRow< Omen >( lumina, parser.ReadColumn< ushort >( 52 ), language ); + Omen = new LazyRow< Omen >( gameData, parser.ReadColumn< ushort >( 52 ), language ); IsPvP = parser.ReadColumn< bool >( 53 ); Unknown54 = parser.ReadColumn< bool >( 54 ); Unknown55 = parser.ReadColumn< bool >( 55 ); diff --git a/src/Lumina.Excel/GeneratedSheets/ActionCastTimeline.cs b/src/Lumina.Excel/GeneratedSheets/ActionCastTimeline.cs index eb05dd13..132fc953 100644 --- a/src/Lumina.Excel/GeneratedSheets/ActionCastTimeline.cs +++ b/src/Lumina.Excel/GeneratedSheets/ActionCastTimeline.cs @@ -7,22 +7,18 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ActionCastTimeline", columnHash: 0x2020acf6 )] - public class ActionCastTimeline : IExcelRow + public class ActionCastTimeline : ExcelRow { - public LazyRow< ActionTimeline > Name; - public LazyRow< VFX > VFX; + public LazyRow< ActionTimeline > Name { get; set; } + public LazyRow< VFX > VFX { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Name = new LazyRow< ActionTimeline >( lumina, parser.ReadColumn< ushort >( 0 ), language ); - VFX = new LazyRow< VFX >( lumina, parser.ReadColumn< ushort >( 1 ), language ); + Name = new LazyRow< ActionTimeline >( gameData, parser.ReadColumn< ushort >( 0 ), language ); + VFX = new LazyRow< VFX >( gameData, parser.ReadColumn< ushort >( 1 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/ActionCastVFX.cs b/src/Lumina.Excel/GeneratedSheets/ActionCastVFX.cs index 649c9867..068950cc 100644 --- a/src/Lumina.Excel/GeneratedSheets/ActionCastVFX.cs +++ b/src/Lumina.Excel/GeneratedSheets/ActionCastVFX.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ActionCastVFX", columnHash: 0xd870e208 )] - public class ActionCastVFX : IExcelRow + public class ActionCastVFX : ExcelRow { - public LazyRow< VFX > VFX; + public LazyRow< VFX > VFX { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - VFX = new LazyRow< VFX >( lumina, parser.ReadColumn< ushort >( 0 ), language ); + VFX = new LazyRow< VFX >( gameData, parser.ReadColumn< ushort >( 0 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/ActionCategory.cs b/src/Lumina.Excel/GeneratedSheets/ActionCategory.cs index ada23801..d0ed22e2 100644 --- a/src/Lumina.Excel/GeneratedSheets/ActionCategory.cs +++ b/src/Lumina.Excel/GeneratedSheets/ActionCategory.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ActionCategory", columnHash: 0xdebb20e3 )] - public class ActionCategory : IExcelRow + public class ActionCategory : ExcelRow { - public SeString Name; + public SeString Name { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/ActionComboRoute.cs b/src/Lumina.Excel/GeneratedSheets/ActionComboRoute.cs index 4ba8b4fc..a27ba67e 100644 --- a/src/Lumina.Excel/GeneratedSheets/ActionComboRoute.cs +++ b/src/Lumina.Excel/GeneratedSheets/ActionComboRoute.cs @@ -7,27 +7,23 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ActionComboRoute", columnHash: 0xc4b3400f )] - public class ActionComboRoute : IExcelRow + public class ActionComboRoute : ExcelRow { - public SeString Name; - public sbyte Unknown1; - public LazyRow< Action >[] Action; - public bool Unknown6; + public SeString Name { get; set; } + public sbyte Unknown1 { get; set; } + public LazyRow< Action >[] Action { get; set; } + public bool Unknown6 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); Unknown1 = parser.ReadColumn< sbyte >( 1 ); Action = new LazyRow< Action >[ 4 ]; for( var i = 0; i < 4; i++ ) - Action[ i ] = new LazyRow< Action >( lumina, parser.ReadColumn< ushort >( 2 + i ), language ); + Action[ i ] = new LazyRow< Action >( gameData, parser.ReadColumn< ushort >( 2 + i ), language ); Unknown6 = parser.ReadColumn< bool >( 6 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/ActionIndirection.cs b/src/Lumina.Excel/GeneratedSheets/ActionIndirection.cs index 28b208df..2313a9cf 100644 --- a/src/Lumina.Excel/GeneratedSheets/ActionIndirection.cs +++ b/src/Lumina.Excel/GeneratedSheets/ActionIndirection.cs @@ -7,21 +7,17 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ActionIndirection", columnHash: 0xfde405db )] - public class ActionIndirection : IExcelRow + public class ActionIndirection : ExcelRow { - public LazyRow< Action > Name; - public sbyte Unknown1; + public LazyRow< Action > Name { get; set; } + public sbyte Unknown1 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Name = new LazyRow< Action >( lumina, parser.ReadColumn< int >( 0 ), language ); + Name = new LazyRow< Action >( gameData, parser.ReadColumn< int >( 0 ), language ); Unknown1 = parser.ReadColumn< sbyte >( 1 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/ActionParam.cs b/src/Lumina.Excel/GeneratedSheets/ActionParam.cs index a5393bad..72c4f9eb 100644 --- a/src/Lumina.Excel/GeneratedSheets/ActionParam.cs +++ b/src/Lumina.Excel/GeneratedSheets/ActionParam.cs @@ -7,19 +7,15 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ActionParam", columnHash: 0x8795cd75 )] - public class ActionParam : IExcelRow + public class ActionParam : ExcelRow { - public short Name; - public short Unknown1; + public short Name { get; set; } + public short Unknown1 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< short >( 0 ); Unknown1 = parser.ReadColumn< short >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/ActionProcStatus.cs b/src/Lumina.Excel/GeneratedSheets/ActionProcStatus.cs index 88d26703..c1275608 100644 --- a/src/Lumina.Excel/GeneratedSheets/ActionProcStatus.cs +++ b/src/Lumina.Excel/GeneratedSheets/ActionProcStatus.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ActionProcStatus", columnHash: 0xd870e208 )] - public class ActionProcStatus : IExcelRow + public class ActionProcStatus : ExcelRow { - public LazyRow< Status > Status; + public LazyRow< Status > Status { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Status = new LazyRow< Status >( lumina, parser.ReadColumn< ushort >( 0 ), language ); + Status = new LazyRow< Status >( gameData, parser.ReadColumn< ushort >( 0 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/ActionTimeline.cs b/src/Lumina.Excel/GeneratedSheets/ActionTimeline.cs index 43f38b14..d6b2bb85 100644 --- a/src/Lumina.Excel/GeneratedSheets/ActionTimeline.cs +++ b/src/Lumina.Excel/GeneratedSheets/ActionTimeline.cs @@ -7,37 +7,33 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ActionTimeline", columnHash: 0x7402d920 )] - public class ActionTimeline : IExcelRow + public class ActionTimeline : ExcelRow { - public byte Type; - public byte Priority; - public bool Pause; - public byte Stance; - public byte Slot; - public byte LookAtMode; - public SeString Key; - public byte ActionTimelineIDMode; - public LazyRow< WeaponTimeline > WeaponTimeline; - public byte LoadType; - public byte StartAttach; - public byte ResidentPap; - public bool Resident; - public ushort KillUpper; - public bool IsMotionCanceledByMoving; - public bool Unknown15; - public byte IsLoop; - public bool Unknown17; - public bool Unknown18; - public bool Unknown19; + public byte Type { get; set; } + public byte Priority { get; set; } + public bool Pause { get; set; } + public byte Stance { get; set; } + public byte Slot { get; set; } + public byte LookAtMode { get; set; } + public SeString Key { get; set; } + public byte ActionTimelineIDMode { get; set; } + public LazyRow< WeaponTimeline > WeaponTimeline { get; set; } + public byte LoadType { get; set; } + public byte StartAttach { get; set; } + public byte ResidentPap { get; set; } + public bool Resident { get; set; } + public ushort KillUpper { get; set; } + public bool IsMotionCanceledByMoving { get; set; } + public bool Unknown15 { get; set; } + public byte IsLoop { get; set; } + public bool Unknown17 { get; set; } + public bool Unknown18 { get; set; } + public bool Unknown19 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Type = parser.ReadColumn< byte >( 0 ); Priority = parser.ReadColumn< byte >( 1 ); @@ -47,7 +43,7 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) LookAtMode = parser.ReadColumn< byte >( 5 ); Key = parser.ReadColumn< SeString >( 6 ); ActionTimelineIDMode = parser.ReadColumn< byte >( 7 ); - WeaponTimeline = new LazyRow< WeaponTimeline >( lumina, parser.ReadColumn< byte >( 8 ), language ); + WeaponTimeline = new LazyRow< WeaponTimeline >( gameData, parser.ReadColumn< byte >( 8 ), language ); LoadType = parser.ReadColumn< byte >( 9 ); StartAttach = parser.ReadColumn< byte >( 10 ); ResidentPap = parser.ReadColumn< byte >( 11 ); diff --git a/src/Lumina.Excel/GeneratedSheets/ActionTimelineMove.cs b/src/Lumina.Excel/GeneratedSheets/ActionTimelineMove.cs index c8bd56c0..6f8eabe6 100644 --- a/src/Lumina.Excel/GeneratedSheets/ActionTimelineMove.cs +++ b/src/Lumina.Excel/GeneratedSheets/ActionTimelineMove.cs @@ -7,23 +7,19 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ActionTimelineMove", columnHash: 0x789014d3 )] - public class ActionTimelineMove : IExcelRow + public class ActionTimelineMove : ExcelRow { - public byte Unknown0; - public byte Unknown1; - public byte Unknown2; - public byte Unknown3; - public byte Unknown4; - public bool Unknown5; + public byte Unknown0 { get; set; } + public byte Unknown1 { get; set; } + public byte Unknown2 { get; set; } + public byte Unknown3 { get; set; } + public byte Unknown4 { get; set; } + public bool Unknown5 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< byte >( 0 ); Unknown1 = parser.ReadColumn< byte >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/ActionTimelineReplace.cs b/src/Lumina.Excel/GeneratedSheets/ActionTimelineReplace.cs index 73f4a3c5..3fe38679 100644 --- a/src/Lumina.Excel/GeneratedSheets/ActionTimelineReplace.cs +++ b/src/Lumina.Excel/GeneratedSheets/ActionTimelineReplace.cs @@ -7,22 +7,18 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ActionTimelineReplace", columnHash: 0x2020acf6 )] - public class ActionTimelineReplace : IExcelRow + public class ActionTimelineReplace : ExcelRow { - public LazyRow< ActionTimeline > Old; - public LazyRow< ActionTimeline > New; + public LazyRow< ActionTimeline > Old { get; set; } + public LazyRow< ActionTimeline > New { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Old = new LazyRow< ActionTimeline >( lumina, parser.ReadColumn< ushort >( 0 ), language ); - New = new LazyRow< ActionTimeline >( lumina, parser.ReadColumn< ushort >( 1 ), language ); + Old = new LazyRow< ActionTimeline >( gameData, parser.ReadColumn< ushort >( 0 ), language ); + New = new LazyRow< ActionTimeline >( gameData, parser.ReadColumn< ushort >( 1 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/ActionTransient.cs b/src/Lumina.Excel/GeneratedSheets/ActionTransient.cs index 6d8c706b..c80b2642 100644 --- a/src/Lumina.Excel/GeneratedSheets/ActionTransient.cs +++ b/src/Lumina.Excel/GeneratedSheets/ActionTransient.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ActionTransient", columnHash: 0xdebb20e3 )] - public class ActionTransient : IExcelRow + public class ActionTransient : ExcelRow { - public SeString Description; + public SeString Description { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Description = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/ActivityFeedButtons.cs b/src/Lumina.Excel/GeneratedSheets/ActivityFeedButtons.cs index b60ee92c..a8b344e0 100644 --- a/src/Lumina.Excel/GeneratedSheets/ActivityFeedButtons.cs +++ b/src/Lumina.Excel/GeneratedSheets/ActivityFeedButtons.cs @@ -7,22 +7,18 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ActivityFeedButtons", columnHash: 0x20072d40 )] - public class ActivityFeedButtons : IExcelRow + public class ActivityFeedButtons : ExcelRow { - public byte Unknown0; - public SeString BannerURL; - public SeString Description; - public SeString Language; - public SeString PictureURL; + public byte Unknown0 { get; set; } + public SeString BannerURL { get; set; } + public SeString Description { get; set; } + public SeString Language { get; set; } + public SeString PictureURL { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< byte >( 0 ); BannerURL = parser.ReadColumn< SeString >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/ActivityFeedCaptions.cs b/src/Lumina.Excel/GeneratedSheets/ActivityFeedCaptions.cs index 358ebb56..a2f0d96e 100644 --- a/src/Lumina.Excel/GeneratedSheets/ActivityFeedCaptions.cs +++ b/src/Lumina.Excel/GeneratedSheets/ActivityFeedCaptions.cs @@ -7,21 +7,17 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ActivityFeedCaptions", columnHash: 0x776ee24c )] - public class ActivityFeedCaptions : IExcelRow + public class ActivityFeedCaptions : ExcelRow { - public SeString JA; - public SeString EN; - public SeString DE; - public SeString FR; + public SeString JA { get; set; } + public SeString EN { get; set; } + public SeString DE { get; set; } + public SeString FR { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); JA = parser.ReadColumn< SeString >( 0 ); EN = parser.ReadColumn< SeString >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/ActivityFeedGroupCaptions.cs b/src/Lumina.Excel/GeneratedSheets/ActivityFeedGroupCaptions.cs index ec57fa82..c849dda9 100644 --- a/src/Lumina.Excel/GeneratedSheets/ActivityFeedGroupCaptions.cs +++ b/src/Lumina.Excel/GeneratedSheets/ActivityFeedGroupCaptions.cs @@ -7,21 +7,17 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ActivityFeedGroupCaptions", columnHash: 0x776ee24c )] - public class ActivityFeedGroupCaptions : IExcelRow + public class ActivityFeedGroupCaptions : ExcelRow { - public SeString JA; - public SeString EN; - public SeString DE; - public SeString FR; + public SeString JA { get; set; } + public SeString EN { get; set; } + public SeString DE { get; set; } + public SeString FR { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); JA = parser.ReadColumn< SeString >( 0 ); EN = parser.ReadColumn< SeString >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/ActivityFeedImages.cs b/src/Lumina.Excel/GeneratedSheets/ActivityFeedImages.cs index 5ec116ab..d046209f 100644 --- a/src/Lumina.Excel/GeneratedSheets/ActivityFeedImages.cs +++ b/src/Lumina.Excel/GeneratedSheets/ActivityFeedImages.cs @@ -7,22 +7,18 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ActivityFeedImages", columnHash: 0x530c5199 )] - public class ActivityFeedImages : IExcelRow + public class ActivityFeedImages : ExcelRow { - public SeString ExpansionImage; - public SeString ActivityFeedJA; - public SeString ActivityFeedEN; - public SeString ActivityFeedDE; - public SeString ActivityFeedFR; + public SeString ExpansionImage { get; set; } + public SeString ActivityFeedJA { get; set; } + public SeString ActivityFeedEN { get; set; } + public SeString ActivityFeedDE { get; set; } + public SeString ActivityFeedFR { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); ExpansionImage = parser.ReadColumn< SeString >( 0 ); ActivityFeedJA = parser.ReadColumn< SeString >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/Addon.cs b/src/Lumina.Excel/GeneratedSheets/Addon.cs index 4badc145..ee44b984 100644 --- a/src/Lumina.Excel/GeneratedSheets/Addon.cs +++ b/src/Lumina.Excel/GeneratedSheets/Addon.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Addon", columnHash: 0xdebb20e3 )] - public class Addon : IExcelRow + public class Addon : ExcelRow { - public SeString Text; + public SeString Text { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Text = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/Adventure.cs b/src/Lumina.Excel/GeneratedSheets/Adventure.cs index abf479c5..e31c3101 100644 --- a/src/Lumina.Excel/GeneratedSheets/Adventure.cs +++ b/src/Lumina.Excel/GeneratedSheets/Adventure.cs @@ -7,39 +7,35 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Adventure", columnHash: 0xf6b785f8 )] - public class Adventure : IExcelRow + public class Adventure : ExcelRow { - public LazyRow< Level > Level; - public int MinLevel; - public byte MaxLevel; - public LazyRow< Emote > Emote; - public ushort MinTime; - public ushort MaxTime; - public LazyRow< PlaceName > PlaceName; - public int IconList; - public int IconDiscovered; - public SeString Name; - public SeString Impression; - public SeString Description; - public int IconUndiscovered; - public bool IsInitial; + public LazyRow< Level > Level { get; set; } + public int MinLevel { get; set; } + public byte MaxLevel { get; set; } + public LazyRow< Emote > Emote { get; set; } + public ushort MinTime { get; set; } + public ushort MaxTime { get; set; } + public LazyRow< PlaceName > PlaceName { get; set; } + public int IconList { get; set; } + public int IconDiscovered { get; set; } + public SeString Name { get; set; } + public SeString Impression { get; set; } + public SeString Description { get; set; } + public int IconUndiscovered { get; set; } + public bool IsInitial { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Level = new LazyRow< Level >( lumina, parser.ReadColumn< int >( 0 ), language ); + Level = new LazyRow< Level >( gameData, parser.ReadColumn< int >( 0 ), language ); MinLevel = parser.ReadColumn< int >( 1 ); MaxLevel = parser.ReadColumn< byte >( 2 ); - Emote = new LazyRow< Emote >( lumina, parser.ReadColumn< ushort >( 3 ), language ); + Emote = new LazyRow< Emote >( gameData, parser.ReadColumn< ushort >( 3 ), language ); MinTime = parser.ReadColumn< ushort >( 4 ); MaxTime = parser.ReadColumn< ushort >( 5 ); - PlaceName = new LazyRow< PlaceName >( lumina, parser.ReadColumn< int >( 6 ), language ); + PlaceName = new LazyRow< PlaceName >( gameData, parser.ReadColumn< int >( 6 ), language ); IconList = parser.ReadColumn< int >( 7 ); IconDiscovered = parser.ReadColumn< int >( 8 ); Name = parser.ReadColumn< SeString >( 9 ); diff --git a/src/Lumina.Excel/GeneratedSheets/AdventureExPhase.cs b/src/Lumina.Excel/GeneratedSheets/AdventureExPhase.cs index c8b906e7..c6f5aaa6 100644 --- a/src/Lumina.Excel/GeneratedSheets/AdventureExPhase.cs +++ b/src/Lumina.Excel/GeneratedSheets/AdventureExPhase.cs @@ -7,26 +7,22 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "AdventureExPhase", columnHash: 0x2ebeea9f )] - public class AdventureExPhase : IExcelRow + public class AdventureExPhase : ExcelRow { - public LazyRow< Quest > Quest; - public LazyRow< Adventure > AdventureBegin; - public LazyRow< Adventure > AdventureEnd; - public byte Unknown3; - public uint Unknown4; + public LazyRow< Quest > Quest { get; set; } + public LazyRow< Adventure > AdventureBegin { get; set; } + public LazyRow< Adventure > AdventureEnd { get; set; } + public byte Unknown3 { get; set; } + public uint Unknown4 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Quest = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 0 ), language ); - AdventureBegin = new LazyRow< Adventure >( lumina, parser.ReadColumn< uint >( 1 ), language ); - AdventureEnd = new LazyRow< Adventure >( lumina, parser.ReadColumn< uint >( 2 ), language ); + Quest = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 0 ), language ); + AdventureBegin = new LazyRow< Adventure >( gameData, parser.ReadColumn< uint >( 1 ), language ); + AdventureEnd = new LazyRow< Adventure >( gameData, parser.ReadColumn< uint >( 2 ), language ); Unknown3 = parser.ReadColumn< byte >( 3 ); Unknown4 = parser.ReadColumn< uint >( 4 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/AetherCurrent.cs b/src/Lumina.Excel/GeneratedSheets/AetherCurrent.cs index 9c2579f7..547e91dc 100644 --- a/src/Lumina.Excel/GeneratedSheets/AetherCurrent.cs +++ b/src/Lumina.Excel/GeneratedSheets/AetherCurrent.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "AetherCurrent", columnHash: 0xdbf43666 )] - public class AetherCurrent : IExcelRow + public class AetherCurrent : ExcelRow { - public LazyRow< Quest > Quest; + public LazyRow< Quest > Quest { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Quest = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 0 ), language ); + Quest = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 0 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/AetherCurrentCompFlgSet.cs b/src/Lumina.Excel/GeneratedSheets/AetherCurrentCompFlgSet.cs index e7c62b0f..df0aa0fb 100644 --- a/src/Lumina.Excel/GeneratedSheets/AetherCurrentCompFlgSet.cs +++ b/src/Lumina.Excel/GeneratedSheets/AetherCurrentCompFlgSet.cs @@ -7,26 +7,22 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "AetherCurrentCompFlgSet", columnHash: 0xa562e4cf )] - public class AetherCurrentCompFlgSet : IExcelRow + public class AetherCurrentCompFlgSet : ExcelRow { - public LazyRow< TerritoryType > Territory; - public byte Unknown1; - public LazyRow< AetherCurrent >[] AetherCurrent; + public LazyRow< TerritoryType > Territory { get; set; } + public byte Unknown1 { get; set; } + public LazyRow< AetherCurrent >[] AetherCurrent { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Territory = new LazyRow< TerritoryType >( lumina, parser.ReadColumn< int >( 0 ), language ); + Territory = new LazyRow< TerritoryType >( gameData, parser.ReadColumn< int >( 0 ), language ); Unknown1 = parser.ReadColumn< byte >( 1 ); AetherCurrent = new LazyRow< AetherCurrent >[ 15 ]; for( var i = 0; i < 15; i++ ) - AetherCurrent[ i ] = new LazyRow< AetherCurrent >( lumina, parser.ReadColumn< int >( 2 + i ), language ); + AetherCurrent[ i ] = new LazyRow< AetherCurrent >( gameData, parser.ReadColumn< int >( 2 + i ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/AetherialWheel.cs b/src/Lumina.Excel/GeneratedSheets/AetherialWheel.cs index 7e2881c2..a46d5779 100644 --- a/src/Lumina.Excel/GeneratedSheets/AetherialWheel.cs +++ b/src/Lumina.Excel/GeneratedSheets/AetherialWheel.cs @@ -7,24 +7,20 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "AetherialWheel", columnHash: 0xfee5acb6 )] - public class AetherialWheel : IExcelRow + public class AetherialWheel : ExcelRow { - public LazyRow< Item > ItemUnprimed; - public LazyRow< Item > ItemPrimed; - public byte Grade; - public byte HoursRequired; + public LazyRow< Item > ItemUnprimed { get; set; } + public LazyRow< Item > ItemPrimed { get; set; } + public byte Grade { get; set; } + public byte HoursRequired { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - ItemUnprimed = new LazyRow< Item >( lumina, parser.ReadColumn< int >( 0 ), language ); - ItemPrimed = new LazyRow< Item >( lumina, parser.ReadColumn< int >( 1 ), language ); + ItemUnprimed = new LazyRow< Item >( gameData, parser.ReadColumn< int >( 0 ), language ); + ItemPrimed = new LazyRow< Item >( gameData, parser.ReadColumn< int >( 1 ), language ); Grade = parser.ReadColumn< byte >( 2 ); HoursRequired = parser.ReadColumn< byte >( 3 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/Aetheryte.cs b/src/Lumina.Excel/GeneratedSheets/Aetheryte.cs index f8974a6a..1f568dfd 100644 --- a/src/Lumina.Excel/GeneratedSheets/Aetheryte.cs +++ b/src/Lumina.Excel/GeneratedSheets/Aetheryte.cs @@ -7,38 +7,34 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Aetheryte", columnHash: 0xcd1e31a4 )] - public class Aetheryte : IExcelRow + public class Aetheryte : ExcelRow { - public SeString Singular; - public sbyte Adjective; - public SeString Plural; - public sbyte PossessivePronoun; - public sbyte StartsWithVowel; - public sbyte Unknown5; - public sbyte Pronoun; - public sbyte Article; - public LazyRow< PlaceName > PlaceName; - public LazyRow< PlaceName > AethernetName; - public LazyRow< TerritoryType > Territory; - public LazyRow< Level >[] Level; - public bool IsAetheryte; - public SeString Unknown16; - public byte AethernetGroup; - public bool Unknown18; - public LazyRow< Quest > RequiredQuest; - public LazyRow< Map > Map; - public short AetherstreamX; - public short AetherstreamY; - public byte Unknown23; + public SeString Singular { get; set; } + public sbyte Adjective { get; set; } + public SeString Plural { get; set; } + public sbyte PossessivePronoun { get; set; } + public sbyte StartsWithVowel { get; set; } + public sbyte Unknown5 { get; set; } + public sbyte Pronoun { get; set; } + public sbyte Article { get; set; } + public LazyRow< PlaceName > PlaceName { get; set; } + public LazyRow< PlaceName > AethernetName { get; set; } + public LazyRow< TerritoryType > Territory { get; set; } + public LazyRow< Level >[] Level { get; set; } + public bool IsAetheryte { get; set; } + public SeString Unknown16 { get; set; } + public byte AethernetGroup { get; set; } + public bool Unknown18 { get; set; } + public LazyRow< Quest > RequiredQuest { get; set; } + public LazyRow< Map > Map { get; set; } + public short AetherstreamX { get; set; } + public short AetherstreamY { get; set; } + public byte Unknown23 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Singular = parser.ReadColumn< SeString >( 0 ); Adjective = parser.ReadColumn< sbyte >( 1 ); @@ -48,18 +44,18 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) Unknown5 = parser.ReadColumn< sbyte >( 5 ); Pronoun = parser.ReadColumn< sbyte >( 6 ); Article = parser.ReadColumn< sbyte >( 7 ); - PlaceName = new LazyRow< PlaceName >( lumina, parser.ReadColumn< ushort >( 8 ), language ); - AethernetName = new LazyRow< PlaceName >( lumina, parser.ReadColumn< ushort >( 9 ), language ); - Territory = new LazyRow< TerritoryType >( lumina, parser.ReadColumn< ushort >( 10 ), language ); + PlaceName = new LazyRow< PlaceName >( gameData, parser.ReadColumn< ushort >( 8 ), language ); + AethernetName = new LazyRow< PlaceName >( gameData, parser.ReadColumn< ushort >( 9 ), language ); + Territory = new LazyRow< TerritoryType >( gameData, parser.ReadColumn< ushort >( 10 ), language ); Level = new LazyRow< Level >[ 4 ]; for( var i = 0; i < 4; i++ ) - Level[ i ] = new LazyRow< Level >( lumina, parser.ReadColumn< uint >( 11 + i ), language ); + Level[ i ] = new LazyRow< Level >( gameData, parser.ReadColumn< uint >( 11 + i ), language ); IsAetheryte = parser.ReadColumn< bool >( 15 ); Unknown16 = parser.ReadColumn< SeString >( 16 ); AethernetGroup = parser.ReadColumn< byte >( 17 ); Unknown18 = parser.ReadColumn< bool >( 18 ); - RequiredQuest = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 19 ), language ); - Map = new LazyRow< Map >( lumina, parser.ReadColumn< ushort >( 20 ), language ); + RequiredQuest = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 19 ), language ); + Map = new LazyRow< Map >( gameData, parser.ReadColumn< ushort >( 20 ), language ); AetherstreamX = parser.ReadColumn< short >( 21 ); AetherstreamY = parser.ReadColumn< short >( 22 ); Unknown23 = parser.ReadColumn< byte >( 23 ); diff --git a/src/Lumina.Excel/GeneratedSheets/AetheryteSystemDefine.cs b/src/Lumina.Excel/GeneratedSheets/AetheryteSystemDefine.cs index e84732a0..7948faba 100644 --- a/src/Lumina.Excel/GeneratedSheets/AetheryteSystemDefine.cs +++ b/src/Lumina.Excel/GeneratedSheets/AetheryteSystemDefine.cs @@ -7,19 +7,15 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "AetheryteSystemDefine", columnHash: 0x98fff20a )] - public class AetheryteSystemDefine : IExcelRow + public class AetheryteSystemDefine : ExcelRow { - public SeString Text; - public uint DefineValue; + public SeString Text { get; set; } + public uint DefineValue { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Text = parser.ReadColumn< SeString >( 0 ); DefineValue = parser.ReadColumn< uint >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/AirshipExplorationLevel.cs b/src/Lumina.Excel/GeneratedSheets/AirshipExplorationLevel.cs index ca79e612..cdd3ba60 100644 --- a/src/Lumina.Excel/GeneratedSheets/AirshipExplorationLevel.cs +++ b/src/Lumina.Excel/GeneratedSheets/AirshipExplorationLevel.cs @@ -7,19 +7,15 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "AirshipExplorationLevel", columnHash: 0x382abf74 )] - public class AirshipExplorationLevel : IExcelRow + public class AirshipExplorationLevel : ExcelRow { - public ushort Capacity; - public uint ExpToNext; + public ushort Capacity { get; set; } + public uint ExpToNext { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Capacity = parser.ReadColumn< ushort >( 0 ); ExpToNext = parser.ReadColumn< uint >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/AirshipExplorationLog.cs b/src/Lumina.Excel/GeneratedSheets/AirshipExplorationLog.cs index 0d4c09a3..66e2846d 100644 --- a/src/Lumina.Excel/GeneratedSheets/AirshipExplorationLog.cs +++ b/src/Lumina.Excel/GeneratedSheets/AirshipExplorationLog.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "AirshipExplorationLog", columnHash: 0xdebb20e3 )] - public class AirshipExplorationLog : IExcelRow + public class AirshipExplorationLog : ExcelRow { - public SeString Text; + public SeString Text { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Text = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/AirshipExplorationParamType.cs b/src/Lumina.Excel/GeneratedSheets/AirshipExplorationParamType.cs index 220fc325..f0996412 100644 --- a/src/Lumina.Excel/GeneratedSheets/AirshipExplorationParamType.cs +++ b/src/Lumina.Excel/GeneratedSheets/AirshipExplorationParamType.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "AirshipExplorationParamType", columnHash: 0xdebb20e3 )] - public class AirshipExplorationParamType : IExcelRow + public class AirshipExplorationParamType : ExcelRow { - public SeString Name; + public SeString Name { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/AirshipExplorationPart.cs b/src/Lumina.Excel/GeneratedSheets/AirshipExplorationPart.cs index dd979ffd..9a86b7a5 100644 --- a/src/Lumina.Excel/GeneratedSheets/AirshipExplorationPart.cs +++ b/src/Lumina.Excel/GeneratedSheets/AirshipExplorationPart.cs @@ -7,29 +7,25 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "AirshipExplorationPart", columnHash: 0xc971f464 )] - public class AirshipExplorationPart : IExcelRow + public class AirshipExplorationPart : ExcelRow { - public byte Unknown0; - public byte Rank; - public byte Components; - public short Surveillance; - public short Retrieval; - public short Speed; - public short Range; - public short Favor; - public ushort Unknown8; - public byte RepairMaterials; + public byte Slot { get; set; } + public byte Rank { get; set; } + public byte Components { get; set; } + public short Surveillance { get; set; } + public short Retrieval { get; set; } + public short Speed { get; set; } + public short Range { get; set; } + public short Favor { get; set; } + public ushort Class { get; set; } + public byte RepairMaterials { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Unknown0 = parser.ReadColumn< byte >( 0 ); + Slot = parser.ReadColumn< byte >( 0 ); Rank = parser.ReadColumn< byte >( 1 ); Components = parser.ReadColumn< byte >( 2 ); Surveillance = parser.ReadColumn< short >( 3 ); @@ -37,7 +33,7 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) Speed = parser.ReadColumn< short >( 5 ); Range = parser.ReadColumn< short >( 6 ); Favor = parser.ReadColumn< short >( 7 ); - Unknown8 = parser.ReadColumn< ushort >( 8 ); + Class = parser.ReadColumn< ushort >( 8 ); RepairMaterials = parser.ReadColumn< byte >( 9 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/AirshipExplorationPoint.cs b/src/Lumina.Excel/GeneratedSheets/AirshipExplorationPoint.cs index da380f44..d49527ee 100644 --- a/src/Lumina.Excel/GeneratedSheets/AirshipExplorationPoint.cs +++ b/src/Lumina.Excel/GeneratedSheets/AirshipExplorationPoint.cs @@ -7,31 +7,27 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "AirshipExplorationPoint", columnHash: 0x307f38a2 )] - public class AirshipExplorationPoint : IExcelRow + public class AirshipExplorationPoint : ExcelRow { - public SeString Name; - public SeString NameShort; - public bool Unknown2; - public short Unknown3; - public short Unknown4; - public byte RequiredLevel; - public ushort RequiredFuel; - public ushort Durationmin; - public ushort Unknown8; - public byte Unknown9; - public byte RequiredSurveillance; - public byte Unknown11; - public byte Unknown12; - public uint ExpReward; + public SeString Name { get; set; } + public SeString NameShort { get; set; } + public bool Unknown2 { get; set; } + public short Unknown3 { get; set; } + public short Unknown4 { get; set; } + public byte RequiredLevel { get; set; } + public ushort RequiredFuel { get; set; } + public ushort Durationmin { get; set; } + public ushort Unknown8 { get; set; } + public byte Unknown9 { get; set; } + public byte RequiredSurveillance { get; set; } + public byte Unknown11 { get; set; } + public byte Unknown12 { get; set; } + public uint ExpReward { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); NameShort = parser.ReadColumn< SeString >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/AnimaWeapon5.cs b/src/Lumina.Excel/GeneratedSheets/AnimaWeapon5.cs index 038d7e5d..0f19c152 100644 --- a/src/Lumina.Excel/GeneratedSheets/AnimaWeapon5.cs +++ b/src/Lumina.Excel/GeneratedSheets/AnimaWeapon5.cs @@ -7,28 +7,24 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "AnimaWeapon5", columnHash: 0xe777b7a6 )] - public class AnimaWeapon5 : IExcelRow + public class AnimaWeapon5 : ExcelRow { - public LazyRow< Item > Item; - public byte Unknown1; - public byte SecondaryStatTotal; - public LazyRow< AnimaWeapon5Param >[] Parameter; + public LazyRow< Item > Item { get; set; } + public byte Unknown1 { get; set; } + public byte SecondaryStatTotal { get; set; } + public LazyRow< AnimaWeapon5Param >[] Parameter { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Item = new LazyRow< Item >( lumina, parser.ReadColumn< int >( 0 ), language ); + Item = new LazyRow< Item >( gameData, parser.ReadColumn< int >( 0 ), language ); Unknown1 = parser.ReadColumn< byte >( 1 ); SecondaryStatTotal = parser.ReadColumn< byte >( 2 ); Parameter = new LazyRow< AnimaWeapon5Param >[ 5 ]; for( var i = 0; i < 5; i++ ) - Parameter[ i ] = new LazyRow< AnimaWeapon5Param >( lumina, parser.ReadColumn< byte >( 3 + i ), language ); + Parameter[ i ] = new LazyRow< AnimaWeapon5Param >( gameData, parser.ReadColumn< byte >( 3 + i ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/AnimaWeapon5Param.cs b/src/Lumina.Excel/GeneratedSheets/AnimaWeapon5Param.cs index c3c37035..30900a5d 100644 --- a/src/Lumina.Excel/GeneratedSheets/AnimaWeapon5Param.cs +++ b/src/Lumina.Excel/GeneratedSheets/AnimaWeapon5Param.cs @@ -7,21 +7,17 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "AnimaWeapon5Param", columnHash: 0x5eb59ccb )] - public class AnimaWeapon5Param : IExcelRow + public class AnimaWeapon5Param : ExcelRow { - public LazyRow< BaseParam > BaseParam; - public SeString Name; + public LazyRow< BaseParam > BaseParam { get; set; } + public SeString Name { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - BaseParam = new LazyRow< BaseParam >( lumina, parser.ReadColumn< byte >( 0 ), language ); + BaseParam = new LazyRow< BaseParam >( gameData, parser.ReadColumn< byte >( 0 ), language ); Name = parser.ReadColumn< SeString >( 1 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/AnimaWeapon5PatternGroup.cs b/src/Lumina.Excel/GeneratedSheets/AnimaWeapon5PatternGroup.cs index 3fecb6e7..7944ce9e 100644 --- a/src/Lumina.Excel/GeneratedSheets/AnimaWeapon5PatternGroup.cs +++ b/src/Lumina.Excel/GeneratedSheets/AnimaWeapon5PatternGroup.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "AnimaWeapon5PatternGroup", columnHash: 0xdebb20e3 )] - public class AnimaWeapon5PatternGroup : IExcelRow + public class AnimaWeapon5PatternGroup : ExcelRow { - public SeString Name; + public SeString Name { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/AnimaWeapon5SpiritTalk.cs b/src/Lumina.Excel/GeneratedSheets/AnimaWeapon5SpiritTalk.cs index 1f08e402..42805cf0 100644 --- a/src/Lumina.Excel/GeneratedSheets/AnimaWeapon5SpiritTalk.cs +++ b/src/Lumina.Excel/GeneratedSheets/AnimaWeapon5SpiritTalk.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "AnimaWeapon5SpiritTalk", columnHash: 0xda365c51 )] - public class AnimaWeapon5SpiritTalk : IExcelRow + public class AnimaWeapon5SpiritTalk : ExcelRow { - public LazyRow< AnimaWeapon5SpiritTalkParam > Dialogue; + public LazyRow< AnimaWeapon5SpiritTalkParam > Dialogue { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Dialogue = new LazyRow< AnimaWeapon5SpiritTalkParam >( lumina, parser.ReadColumn< int >( 0 ), language ); + Dialogue = new LazyRow< AnimaWeapon5SpiritTalkParam >( gameData, parser.ReadColumn< int >( 0 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/AnimaWeapon5SpiritTalkParam.cs b/src/Lumina.Excel/GeneratedSheets/AnimaWeapon5SpiritTalkParam.cs index b9de3bd7..2d462fe7 100644 --- a/src/Lumina.Excel/GeneratedSheets/AnimaWeapon5SpiritTalkParam.cs +++ b/src/Lumina.Excel/GeneratedSheets/AnimaWeapon5SpiritTalkParam.cs @@ -7,19 +7,15 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "AnimaWeapon5SpiritTalkParam", columnHash: 0x9db0e48f )] - public class AnimaWeapon5SpiritTalkParam : IExcelRow + public class AnimaWeapon5SpiritTalkParam : ExcelRow { - public SeString Prologue; - public SeString Epilogue; + public SeString Prologue { get; set; } + public SeString Epilogue { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Prologue = parser.ReadColumn< SeString >( 0 ); Epilogue = parser.ReadColumn< SeString >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/AnimaWeapon5TradeItem.cs b/src/Lumina.Excel/GeneratedSheets/AnimaWeapon5TradeItem.cs index ff56b341..165894e0 100644 --- a/src/Lumina.Excel/GeneratedSheets/AnimaWeapon5TradeItem.cs +++ b/src/Lumina.Excel/GeneratedSheets/AnimaWeapon5TradeItem.cs @@ -7,7 +7,7 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "AnimaWeapon5TradeItem", columnHash: 0x40f1e693 )] - public class AnimaWeapon5TradeItem : IExcelRow + public class AnimaWeapon5TradeItem : ExcelRow { public struct UnkStruct3Struct { @@ -16,22 +16,18 @@ public struct UnkStruct3Struct public byte Quantity; } - public byte Unknown0; - public LazyRow< Item > CrystalSand; - public byte Qty; - public UnkStruct3Struct[] UnkStruct3; - public LazyRow< AnimaWeapon5PatternGroup > Category; + public byte Unknown0 { get; set; } + public LazyRow< Item > CrystalSand { get; set; } + public byte Qty { get; set; } + public UnkStruct3Struct[] UnkStruct3 { get; set; } + public LazyRow< AnimaWeapon5PatternGroup > Category { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< byte >( 0 ); - CrystalSand = new LazyRow< Item >( lumina, parser.ReadColumn< uint >( 1 ), language ); + CrystalSand = new LazyRow< Item >( gameData, parser.ReadColumn< uint >( 1 ), language ); Qty = parser.ReadColumn< byte >( 2 ); UnkStruct3 = new UnkStruct3Struct[ 8 ]; for( var i = 0; i < 8; i++ ) @@ -41,7 +37,7 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) UnkStruct3[ i ].IsHQ = parser.ReadColumn< bool >( 3 + ( i * 3 + 1 ) ); UnkStruct3[ i ].Quantity = parser.ReadColumn< byte >( 3 + ( i * 3 + 2 ) ); } - Category = new LazyRow< AnimaWeapon5PatternGroup >( lumina, parser.ReadColumn< byte >( 27 ), language ); + Category = new LazyRow< AnimaWeapon5PatternGroup >( gameData, parser.ReadColumn< byte >( 27 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/AnimaWeaponFUITalk.cs b/src/Lumina.Excel/GeneratedSheets/AnimaWeaponFUITalk.cs index dfbb02b4..a12e45e2 100644 --- a/src/Lumina.Excel/GeneratedSheets/AnimaWeaponFUITalk.cs +++ b/src/Lumina.Excel/GeneratedSheets/AnimaWeaponFUITalk.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "AnimaWeaponFUITalk", columnHash: 0xda365c51 )] - public class AnimaWeaponFUITalk : IExcelRow + public class AnimaWeaponFUITalk : ExcelRow { - public LazyRow< AnimaWeaponFUITalkParam > Dialogue; + public LazyRow< AnimaWeaponFUITalkParam > Dialogue { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Dialogue = new LazyRow< AnimaWeaponFUITalkParam >( lumina, parser.ReadColumn< int >( 0 ), language ); + Dialogue = new LazyRow< AnimaWeaponFUITalkParam >( gameData, parser.ReadColumn< int >( 0 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/AnimaWeaponFUITalkParam.cs b/src/Lumina.Excel/GeneratedSheets/AnimaWeaponFUITalkParam.cs index 3d5396c4..c60f1294 100644 --- a/src/Lumina.Excel/GeneratedSheets/AnimaWeaponFUITalkParam.cs +++ b/src/Lumina.Excel/GeneratedSheets/AnimaWeaponFUITalkParam.cs @@ -7,19 +7,15 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "AnimaWeaponFUITalkParam", columnHash: 0x9db0e48f )] - public class AnimaWeaponFUITalkParam : IExcelRow + public class AnimaWeaponFUITalkParam : ExcelRow { - public SeString Prologue; - public SeString Epilogue; + public SeString Prologue { get; set; } + public SeString Epilogue { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Prologue = parser.ReadColumn< SeString >( 0 ); Epilogue = parser.ReadColumn< SeString >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/AnimaWeaponIcon.cs b/src/Lumina.Excel/GeneratedSheets/AnimaWeaponIcon.cs index ce953438..2853c366 100644 --- a/src/Lumina.Excel/GeneratedSheets/AnimaWeaponIcon.cs +++ b/src/Lumina.Excel/GeneratedSheets/AnimaWeaponIcon.cs @@ -7,22 +7,18 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "AnimaWeaponIcon", columnHash: 0x63c20db3 )] - public class AnimaWeaponIcon : IExcelRow + public class AnimaWeaponIcon : ExcelRow { - public int Hyperconductive; - public int Reborn; - public int Sharpened; - public int Zodiac; - public int ZodiacLux; + public int Hyperconductive { get; set; } + public int Reborn { get; set; } + public int Sharpened { get; set; } + public int Zodiac { get; set; } + public int ZodiacLux { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Hyperconductive = parser.ReadColumn< int >( 0 ); Reborn = parser.ReadColumn< int >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/AnimaWeaponItem.cs b/src/Lumina.Excel/GeneratedSheets/AnimaWeaponItem.cs index e3fc48d2..fead1031 100644 --- a/src/Lumina.Excel/GeneratedSheets/AnimaWeaponItem.cs +++ b/src/Lumina.Excel/GeneratedSheets/AnimaWeaponItem.cs @@ -7,22 +7,18 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "AnimaWeaponItem", columnHash: 0xe0a5cdd0 )] - public class AnimaWeaponItem : IExcelRow + public class AnimaWeaponItem : ExcelRow { - public LazyRow< Item >[] Item; + public LazyRow< Item >[] Item { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Item = new LazyRow< Item >[ 14 ]; for( var i = 0; i < 14; i++ ) - Item[ i ] = new LazyRow< Item >( lumina, parser.ReadColumn< uint >( 0 + i ), language ); + Item[ i ] = new LazyRow< Item >( gameData, parser.ReadColumn< uint >( 0 + i ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/AnimationLOD.cs b/src/Lumina.Excel/GeneratedSheets/AnimationLOD.cs index c0dd003f..1f553b68 100644 --- a/src/Lumina.Excel/GeneratedSheets/AnimationLOD.cs +++ b/src/Lumina.Excel/GeneratedSheets/AnimationLOD.cs @@ -7,21 +7,17 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "AnimationLOD", columnHash: 0x261cfad0 )] - public class AnimationLOD : IExcelRow + public class AnimationLOD : ExcelRow { - public float CameraDistance; - public float SampleInterval; - public sbyte BoneLOD; - public bool[] AnimationEnable; + public float CameraDistance { get; set; } + public float SampleInterval { get; set; } + public sbyte BoneLOD { get; set; } + public bool[] AnimationEnable { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); CameraDistance = parser.ReadColumn< float >( 0 ); SampleInterval = parser.ReadColumn< float >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/AozAction.cs b/src/Lumina.Excel/GeneratedSheets/AozAction.cs index 30fb0e37..f0277ba5 100644 --- a/src/Lumina.Excel/GeneratedSheets/AozAction.cs +++ b/src/Lumina.Excel/GeneratedSheets/AozAction.cs @@ -7,21 +7,17 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "AozAction", columnHash: 0x5a516458 )] - public class AozAction : IExcelRow + public class AozAction : ExcelRow { - public LazyRow< Action > Action; - public byte Unknown1; + public LazyRow< Action > Action { get; set; } + public byte Unknown1 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Action = new LazyRow< Action >( lumina, parser.ReadColumn< uint >( 0 ), language ); + Action = new LazyRow< Action >( gameData, parser.ReadColumn< uint >( 0 ), language ); Unknown1 = parser.ReadColumn< byte >( 1 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/AozActionTransient.cs b/src/Lumina.Excel/GeneratedSheets/AozActionTransient.cs index 89c7f218..89f84e25 100644 --- a/src/Lumina.Excel/GeneratedSheets/AozActionTransient.cs +++ b/src/Lumina.Excel/GeneratedSheets/AozActionTransient.cs @@ -7,58 +7,54 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "AozActionTransient", columnHash: 0x4921bb28 )] - public class AozActionTransient : IExcelRow + public class AozActionTransient : ExcelRow { - public byte Number; - public uint Icon; - public SeString Stats; - public SeString Description; - public byte Unknown4; - public LazyRow< ContentFinderCondition > Location; - public LazyRow< Quest > StartQuest; - public LazyRow< Quest > NextQuest; - public bool Unknown8; - public bool Unknown9; - public bool Unknown10; - public bool Unknown11; - public bool Unknown12; - public bool Unknown13; - public bool Unknown14; - public bool Unknown15; - public bool Unknown16; - public bool Unknown17; - public bool Unknown18; - public bool Unknown19; + public byte Number { get; set; } + public uint Icon { get; set; } + public SeString Stats { get; set; } + public SeString Description { get; set; } + public byte LocationKey { get; set; } + public ushort Location { get; set; } + public LazyRow< Quest > RequiredForQuest { get; set; } + public LazyRow< Quest > PreviousQuest { get; set; } + public bool TargetsEnemy { get; set; } + public bool TargetsSelfOrAlly { get; set; } + public bool CauseSlow { get; set; } + public bool CausePetrify { get; set; } + public bool CauseParalysis { get; set; } + public bool CauseInterrupt { get; set; } + public bool CauseBlind { get; set; } + public bool CauseStun { get; set; } + public bool CauseSleep { get; set; } + public bool CauseBind { get; set; } + public bool CauseHeavy { get; set; } + public bool CauseDeath { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Number = parser.ReadColumn< byte >( 0 ); Icon = parser.ReadColumn< uint >( 1 ); Stats = parser.ReadColumn< SeString >( 2 ); Description = parser.ReadColumn< SeString >( 3 ); - Unknown4 = parser.ReadColumn< byte >( 4 ); - Location = new LazyRow< ContentFinderCondition >( lumina, parser.ReadColumn< ushort >( 5 ), language ); - StartQuest = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 6 ), language ); - NextQuest = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 7 ), language ); - Unknown8 = parser.ReadColumn< bool >( 8 ); - Unknown9 = parser.ReadColumn< bool >( 9 ); - Unknown10 = parser.ReadColumn< bool >( 10 ); - Unknown11 = parser.ReadColumn< bool >( 11 ); - Unknown12 = parser.ReadColumn< bool >( 12 ); - Unknown13 = parser.ReadColumn< bool >( 13 ); - Unknown14 = parser.ReadColumn< bool >( 14 ); - Unknown15 = parser.ReadColumn< bool >( 15 ); - Unknown16 = parser.ReadColumn< bool >( 16 ); - Unknown17 = parser.ReadColumn< bool >( 17 ); - Unknown18 = parser.ReadColumn< bool >( 18 ); - Unknown19 = parser.ReadColumn< bool >( 19 ); + LocationKey = parser.ReadColumn< byte >( 4 ); + Location = parser.ReadColumn< ushort >( 5 ); + RequiredForQuest = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 6 ), language ); + PreviousQuest = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 7 ), language ); + TargetsEnemy = parser.ReadColumn< bool >( 8 ); + TargetsSelfOrAlly = parser.ReadColumn< bool >( 9 ); + CauseSlow = parser.ReadColumn< bool >( 10 ); + CausePetrify = parser.ReadColumn< bool >( 11 ); + CauseParalysis = parser.ReadColumn< bool >( 12 ); + CauseInterrupt = parser.ReadColumn< bool >( 13 ); + CauseBlind = parser.ReadColumn< bool >( 14 ); + CauseStun = parser.ReadColumn< bool >( 15 ); + CauseSleep = parser.ReadColumn< bool >( 16 ); + CauseBind = parser.ReadColumn< bool >( 17 ); + CauseHeavy = parser.ReadColumn< bool >( 18 ); + CauseDeath = parser.ReadColumn< bool >( 19 ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/AquariumFish.cs b/src/Lumina.Excel/GeneratedSheets/AquariumFish.cs index f89b5aad..5a467254 100644 --- a/src/Lumina.Excel/GeneratedSheets/AquariumFish.cs +++ b/src/Lumina.Excel/GeneratedSheets/AquariumFish.cs @@ -7,25 +7,21 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "AquariumFish", columnHash: 0x9b5e32ba )] - public class AquariumFish : IExcelRow + public class AquariumFish : ExcelRow { - public LazyRow< AquariumWater > AquariumWater; - public byte Size; - public LazyRow< Item > Item; - public ushort Unknown3; + public LazyRow< AquariumWater > AquariumWater { get; set; } + public byte Size { get; set; } + public LazyRow< Item > Item { get; set; } + public ushort Unknown3 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - AquariumWater = new LazyRow< AquariumWater >( lumina, parser.ReadColumn< byte >( 0 ), language ); + AquariumWater = new LazyRow< AquariumWater >( gameData, parser.ReadColumn< byte >( 0 ), language ); Size = parser.ReadColumn< byte >( 1 ); - Item = new LazyRow< Item >( lumina, parser.ReadColumn< uint >( 2 ), language ); + Item = new LazyRow< Item >( gameData, parser.ReadColumn< uint >( 2 ), language ); Unknown3 = parser.ReadColumn< ushort >( 3 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/AquariumWater.cs b/src/Lumina.Excel/GeneratedSheets/AquariumWater.cs index bbfba082..ea98ec74 100644 --- a/src/Lumina.Excel/GeneratedSheets/AquariumWater.cs +++ b/src/Lumina.Excel/GeneratedSheets/AquariumWater.cs @@ -7,19 +7,15 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "AquariumWater", columnHash: 0x5eb59ccb )] - public class AquariumWater : IExcelRow + public class AquariumWater : ExcelRow { - public byte Unknown0; - public SeString Name; + public byte Unknown0 { get; set; } + public SeString Name { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< byte >( 0 ); Name = parser.ReadColumn< SeString >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/ArrayEventHandler.cs b/src/Lumina.Excel/GeneratedSheets/ArrayEventHandler.cs index 89ab9074..2c8fb83d 100644 --- a/src/Lumina.Excel/GeneratedSheets/ArrayEventHandler.cs +++ b/src/Lumina.Excel/GeneratedSheets/ArrayEventHandler.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ArrayEventHandler", columnHash: 0xb404681e )] - public class ArrayEventHandler : IExcelRow + public class ArrayEventHandler : ExcelRow { - public uint[] Data; + public uint[] Data { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Data = new uint[ 16 ]; for( var i = 0; i < 16; i++ ) diff --git a/src/Lumina.Excel/GeneratedSheets/AttackType.cs b/src/Lumina.Excel/GeneratedSheets/AttackType.cs index fa477a99..269576d3 100644 --- a/src/Lumina.Excel/GeneratedSheets/AttackType.cs +++ b/src/Lumina.Excel/GeneratedSheets/AttackType.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "AttackType", columnHash: 0xdebb20e3 )] - public class AttackType : IExcelRow + public class AttackType : ExcelRow { - public SeString Name; + public SeString Name { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/BGM.cs b/src/Lumina.Excel/GeneratedSheets/BGM.cs index 23ab761e..955790c0 100644 --- a/src/Lumina.Excel/GeneratedSheets/BGM.cs +++ b/src/Lumina.Excel/GeneratedSheets/BGM.cs @@ -7,24 +7,20 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "BGM", columnHash: 0xc9fc6953 )] - public class BGM : IExcelRow + public class BGM : ExcelRow { - public SeString File; - public byte Priority; - public bool DisableRestartTimeOut; - public bool DisableRestart; - public bool PassEnd; - public float DisableRestartResetTime; - public byte SpecialMode; + public SeString File { get; set; } + public byte Priority { get; set; } + public bool DisableRestartTimeOut { get; set; } + public bool DisableRestart { get; set; } + public bool PassEnd { get; set; } + public float DisableRestartResetTime { get; set; } + public byte SpecialMode { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); File = parser.ReadColumn< SeString >( 0 ); Priority = parser.ReadColumn< byte >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/BGMFade.cs b/src/Lumina.Excel/GeneratedSheets/BGMFade.cs index 99fb47a5..49c7f2fd 100644 --- a/src/Lumina.Excel/GeneratedSheets/BGMFade.cs +++ b/src/Lumina.Excel/GeneratedSheets/BGMFade.cs @@ -7,24 +7,20 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "BGMFade", columnHash: 0xf09994a9 )] - public class BGMFade : IExcelRow + public class BGMFade : ExcelRow { - public int SceneOut; - public int SceneIn; - public LazyRow< BGMFadeType > BGMFadeType; + public int SceneOut { get; set; } + public int SceneIn { get; set; } + public LazyRow< BGMFadeType > BGMFadeType { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); SceneOut = parser.ReadColumn< int >( 0 ); SceneIn = parser.ReadColumn< int >( 1 ); - BGMFadeType = new LazyRow< BGMFadeType >( lumina, parser.ReadColumn< int >( 2 ), language ); + BGMFadeType = new LazyRow< BGMFadeType >( gameData, parser.ReadColumn< int >( 2 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/BGMFadeType.cs b/src/Lumina.Excel/GeneratedSheets/BGMFadeType.cs index ccb22188..6e16b0eb 100644 --- a/src/Lumina.Excel/GeneratedSheets/BGMFadeType.cs +++ b/src/Lumina.Excel/GeneratedSheets/BGMFadeType.cs @@ -7,21 +7,17 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "BGMFadeType", columnHash: 0xe018b5fa )] - public class BGMFadeType : IExcelRow + public class BGMFadeType : ExcelRow { - public float FadeOutTime; - public float FadeInTime; - public float FadeInStartTime; - public float ResumeFadeInTime; + public float FadeOutTime { get; set; } + public float FadeInTime { get; set; } + public float FadeInStartTime { get; set; } + public float ResumeFadeInTime { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); FadeOutTime = parser.ReadColumn< float >( 0 ); FadeInTime = parser.ReadColumn< float >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/BGMScene.cs b/src/Lumina.Excel/GeneratedSheets/BGMScene.cs index d7557036..00e2edcb 100644 --- a/src/Lumina.Excel/GeneratedSheets/BGMScene.cs +++ b/src/Lumina.Excel/GeneratedSheets/BGMScene.cs @@ -7,22 +7,18 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "BGMScene", columnHash: 0x2711a5ea )] - public class BGMScene : IExcelRow + public class BGMScene : ExcelRow { - public bool EnableDisableRestart; - public bool Resume; - public bool EnablePassEnd; - public bool ForceAutoReset; - public bool IgnoreBattle; + public bool EnableDisableRestart { get; set; } + public bool Resume { get; set; } + public bool EnablePassEnd { get; set; } + public bool ForceAutoReset { get; set; } + public bool IgnoreBattle { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); EnableDisableRestart = parser.ReadColumn< bool >( 0 ); Resume = parser.ReadColumn< bool >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/BGMSituation.cs b/src/Lumina.Excel/GeneratedSheets/BGMSituation.cs index 15f95d36..3ce083b6 100644 --- a/src/Lumina.Excel/GeneratedSheets/BGMSituation.cs +++ b/src/Lumina.Excel/GeneratedSheets/BGMSituation.cs @@ -7,28 +7,24 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "BGMSituation", columnHash: 0x64a88f98 )] - public class BGMSituation : IExcelRow + public class BGMSituation : ExcelRow { - public LazyRow< BGM > DaytimeID; - public LazyRow< BGM > NightID; - public LazyRow< BGM > BattleID; - public LazyRow< BGM > DaybreakID; - public LazyRow< BGM > TwilightID; + public LazyRow< BGM > DaytimeID { get; set; } + public LazyRow< BGM > NightID { get; set; } + public LazyRow< BGM > BattleID { get; set; } + public LazyRow< BGM > DaybreakID { get; set; } + public LazyRow< BGM > TwilightID { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - DaytimeID = new LazyRow< BGM >( lumina, parser.ReadColumn< ushort >( 0 ), language ); - NightID = new LazyRow< BGM >( lumina, parser.ReadColumn< ushort >( 1 ), language ); - BattleID = new LazyRow< BGM >( lumina, parser.ReadColumn< ushort >( 2 ), language ); - DaybreakID = new LazyRow< BGM >( lumina, parser.ReadColumn< ushort >( 3 ), language ); - TwilightID = new LazyRow< BGM >( lumina, parser.ReadColumn< ushort >( 4 ), language ); + DaytimeID = new LazyRow< BGM >( gameData, parser.ReadColumn< ushort >( 0 ), language ); + NightID = new LazyRow< BGM >( gameData, parser.ReadColumn< ushort >( 1 ), language ); + BattleID = new LazyRow< BGM >( gameData, parser.ReadColumn< ushort >( 2 ), language ); + DaybreakID = new LazyRow< BGM >( gameData, parser.ReadColumn< ushort >( 3 ), language ); + TwilightID = new LazyRow< BGM >( gameData, parser.ReadColumn< ushort >( 4 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/BGMSwitch.cs b/src/Lumina.Excel/GeneratedSheets/BGMSwitch.cs index e26492b3..feecd9e2 100644 --- a/src/Lumina.Excel/GeneratedSheets/BGMSwitch.cs +++ b/src/Lumina.Excel/GeneratedSheets/BGMSwitch.cs @@ -7,26 +7,22 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "BGMSwitch", columnHash: 0x0989d4f2 )] - public class BGMSwitch : IExcelRow + public class BGMSwitch : ExcelRow { - public LazyRow< BGMSystemDefine > BGMSystemDefine; - public LazyRow< Quest > Quest; - public byte Unknown2; - public LazyRow< BGM > BGM; + public LazyRow< BGMSystemDefine > BGMSystemDefine { get; set; } + public LazyRow< Quest > Quest { get; set; } + public byte Unknown2 { get; set; } + public LazyRow< BGM > BGM { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - BGMSystemDefine = new LazyRow< BGMSystemDefine >( lumina, parser.ReadColumn< byte >( 0 ), language ); - Quest = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 1 ), language ); + BGMSystemDefine = new LazyRow< BGMSystemDefine >( gameData, parser.ReadColumn< byte >( 0 ), language ); + Quest = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 1 ), language ); Unknown2 = parser.ReadColumn< byte >( 2 ); - BGM = new LazyRow< BGM >( lumina, parser.ReadColumn< ushort >( 3 ), language ); + BGM = new LazyRow< BGM >( gameData, parser.ReadColumn< ushort >( 3 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/BGMSystemDefine.cs b/src/Lumina.Excel/GeneratedSheets/BGMSystemDefine.cs index 45b95b29..221b59c3 100644 --- a/src/Lumina.Excel/GeneratedSheets/BGMSystemDefine.cs +++ b/src/Lumina.Excel/GeneratedSheets/BGMSystemDefine.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "BGMSystemDefine", columnHash: 0xd16a1b6c )] - public class BGMSystemDefine : IExcelRow + public class BGMSystemDefine : ExcelRow { - public float Define; + public float Define { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Define = parser.ReadColumn< float >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/BNpcAnnounceIcon.cs b/src/Lumina.Excel/GeneratedSheets/BNpcAnnounceIcon.cs index 0bd7f2f8..b7eeb599 100644 --- a/src/Lumina.Excel/GeneratedSheets/BNpcAnnounceIcon.cs +++ b/src/Lumina.Excel/GeneratedSheets/BNpcAnnounceIcon.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "BNpcAnnounceIcon", columnHash: 0xdbf43666 )] - public class BNpcAnnounceIcon : IExcelRow + public class BNpcAnnounceIcon : ExcelRow { - public uint Icon; + public uint Icon { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Icon = parser.ReadColumn< uint >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/BNpcBase.cs b/src/Lumina.Excel/GeneratedSheets/BNpcBase.cs index 0315d785..39347d59 100644 --- a/src/Lumina.Excel/GeneratedSheets/BNpcBase.cs +++ b/src/Lumina.Excel/GeneratedSheets/BNpcBase.cs @@ -7,52 +7,48 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "BNpcBase", columnHash: 0xdd911c47 )] - public class BNpcBase : IExcelRow + public class BNpcBase : ExcelRow { - public LazyRow< Behavior > Behavior; - public byte Battalion; - public byte LinkRace; - public byte Rank; - public float Scale; - public LazyRow< ModelChara > ModelChara; - public LazyRow< BNpcCustomize > BNpcCustomize; - public LazyRow< NpcEquip > NpcEquip; - public ushort Special; - public byte SEPack; - public bool Unknown10; - public LazyRow< ArrayEventHandler > ArrayEventHandler; - public LazyRow< BNpcParts > BNpcParts; - public bool Unknown13; - public bool IsTargetLine; - public bool IsDisplayLevel; - public bool Unknown16; - public bool Unknown17; - public byte Unknown18; - public byte Unknown19; - public byte Unknown20; + public LazyRow< Behavior > Behavior { get; set; } + public byte Battalion { get; set; } + public byte LinkRace { get; set; } + public byte Rank { get; set; } + public float Scale { get; set; } + public LazyRow< ModelChara > ModelChara { get; set; } + public LazyRow< BNpcCustomize > BNpcCustomize { get; set; } + public LazyRow< NpcEquip > NpcEquip { get; set; } + public ushort Special { get; set; } + public byte SEPack { get; set; } + public bool Unknown10 { get; set; } + public LazyRow< ArrayEventHandler > ArrayEventHandler { get; set; } + public LazyRow< BNpcParts > BNpcParts { get; set; } + public bool Unknown13 { get; set; } + public bool IsTargetLine { get; set; } + public bool IsDisplayLevel { get; set; } + public bool Unknown16 { get; set; } + public bool Unknown17 { get; set; } + public byte Unknown18 { get; set; } + public byte Unknown19 { get; set; } + public byte Unknown20 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Behavior = new LazyRow< Behavior >( lumina, parser.ReadColumn< ushort >( 0 ), language ); + Behavior = new LazyRow< Behavior >( gameData, parser.ReadColumn< ushort >( 0 ), language ); Battalion = parser.ReadColumn< byte >( 1 ); LinkRace = parser.ReadColumn< byte >( 2 ); Rank = parser.ReadColumn< byte >( 3 ); Scale = parser.ReadColumn< float >( 4 ); - ModelChara = new LazyRow< ModelChara >( lumina, parser.ReadColumn< ushort >( 5 ), language ); - BNpcCustomize = new LazyRow< BNpcCustomize >( lumina, parser.ReadColumn< ushort >( 6 ), language ); - NpcEquip = new LazyRow< NpcEquip >( lumina, parser.ReadColumn< ushort >( 7 ), language ); + ModelChara = new LazyRow< ModelChara >( gameData, parser.ReadColumn< ushort >( 5 ), language ); + BNpcCustomize = new LazyRow< BNpcCustomize >( gameData, parser.ReadColumn< ushort >( 6 ), language ); + NpcEquip = new LazyRow< NpcEquip >( gameData, parser.ReadColumn< ushort >( 7 ), language ); Special = parser.ReadColumn< ushort >( 8 ); SEPack = parser.ReadColumn< byte >( 9 ); Unknown10 = parser.ReadColumn< bool >( 10 ); - ArrayEventHandler = new LazyRow< ArrayEventHandler >( lumina, parser.ReadColumn< int >( 11 ), language ); - BNpcParts = new LazyRow< BNpcParts >( lumina, parser.ReadColumn< byte >( 12 ), language ); + ArrayEventHandler = new LazyRow< ArrayEventHandler >( gameData, parser.ReadColumn< int >( 11 ), language ); + BNpcParts = new LazyRow< BNpcParts >( gameData, parser.ReadColumn< byte >( 12 ), language ); Unknown13 = parser.ReadColumn< bool >( 13 ); IsTargetLine = parser.ReadColumn< bool >( 14 ); IsDisplayLevel = parser.ReadColumn< bool >( 15 ); diff --git a/src/Lumina.Excel/GeneratedSheets/BNpcCustomize.cs b/src/Lumina.Excel/GeneratedSheets/BNpcCustomize.cs index ebedabd5..b97f73f2 100644 --- a/src/Lumina.Excel/GeneratedSheets/BNpcCustomize.cs +++ b/src/Lumina.Excel/GeneratedSheets/BNpcCustomize.cs @@ -7,49 +7,45 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "BNpcCustomize", columnHash: 0x18f060d4 )] - public class BNpcCustomize : IExcelRow + public class BNpcCustomize : ExcelRow { - public LazyRow< Race > Race; - public byte Gender; - public byte BodyType; - public byte Height; - public LazyRow< Tribe > Tribe; - public byte Face; - public byte HairStyle; - public byte HairHighlight; - public byte SkinColor; - public byte EyeHeterochromia; - public byte HairColor; - public byte HairHighlightColor; - public byte FacialFeature; - public byte FacialFeatureColor; - public byte Eyebrows; - public byte EyeColor; - public byte EyeShape; - public byte Nose; - public byte Jaw; - public byte Mouth; - public byte LipColor; - public byte BustOrTone1; - public byte ExtraFeature1; - public byte ExtraFeature2OrBust; - public byte FacePaint; - public byte FacePaintColor; + public LazyRow< Race > Race { get; set; } + public byte Gender { get; set; } + public byte BodyType { get; set; } + public byte Height { get; set; } + public LazyRow< Tribe > Tribe { get; set; } + public byte Face { get; set; } + public byte HairStyle { get; set; } + public byte HairHighlight { get; set; } + public byte SkinColor { get; set; } + public byte EyeHeterochromia { get; set; } + public byte HairColor { get; set; } + public byte HairHighlightColor { get; set; } + public byte FacialFeature { get; set; } + public byte FacialFeatureColor { get; set; } + public byte Eyebrows { get; set; } + public byte EyeColor { get; set; } + public byte EyeShape { get; set; } + public byte Nose { get; set; } + public byte Jaw { get; set; } + public byte Mouth { get; set; } + public byte LipColor { get; set; } + public byte BustOrTone1 { get; set; } + public byte ExtraFeature1 { get; set; } + public byte ExtraFeature2OrBust { get; set; } + public byte FacePaint { get; set; } + public byte FacePaintColor { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Race = new LazyRow< Race >( lumina, parser.ReadColumn< byte >( 0 ), language ); + Race = new LazyRow< Race >( gameData, parser.ReadColumn< byte >( 0 ), language ); Gender = parser.ReadColumn< byte >( 1 ); BodyType = parser.ReadColumn< byte >( 2 ); Height = parser.ReadColumn< byte >( 3 ); - Tribe = new LazyRow< Tribe >( lumina, parser.ReadColumn< byte >( 4 ), language ); + Tribe = new LazyRow< Tribe >( gameData, parser.ReadColumn< byte >( 4 ), language ); Face = parser.ReadColumn< byte >( 5 ); HairStyle = parser.ReadColumn< byte >( 6 ); HairHighlight = parser.ReadColumn< byte >( 7 ); diff --git a/src/Lumina.Excel/GeneratedSheets/BNpcName.cs b/src/Lumina.Excel/GeneratedSheets/BNpcName.cs index 59121e51..d109f3c6 100644 --- a/src/Lumina.Excel/GeneratedSheets/BNpcName.cs +++ b/src/Lumina.Excel/GeneratedSheets/BNpcName.cs @@ -7,25 +7,21 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "BNpcName", columnHash: 0x77a72da0 )] - public class BNpcName : IExcelRow + public class BNpcName : ExcelRow { - public SeString Singular; - public sbyte Adjective; - public SeString Plural; - public sbyte PossessivePronoun; - public sbyte StartsWithVowel; - public sbyte Unknown5; - public sbyte Pronoun; - public sbyte Article; + public SeString Singular { get; set; } + public sbyte Adjective { get; set; } + public SeString Plural { get; set; } + public sbyte PossessivePronoun { get; set; } + public sbyte StartsWithVowel { get; set; } + public sbyte Unknown5 { get; set; } + public sbyte Pronoun { get; set; } + public sbyte Article { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Singular = parser.ReadColumn< SeString >( 0 ); Adjective = parser.ReadColumn< sbyte >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/BNpcParts.cs b/src/Lumina.Excel/GeneratedSheets/BNpcParts.cs index 6b444e4d..c99e7386 100644 --- a/src/Lumina.Excel/GeneratedSheets/BNpcParts.cs +++ b/src/Lumina.Excel/GeneratedSheets/BNpcParts.cs @@ -7,74 +7,70 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "BNpcParts", columnHash: 0xcce3205c )] - public class BNpcParts : IExcelRow + public class BNpcParts : ExcelRow { - public LazyRow< BNpcBase > BNpcBase1; - public byte PartSlot1; - public bool Unknown2; - public bool Unknown3; - public bool Unknown4; - public bool Unknown5; - public float X1; - public float Y1; - public float Z1; - public short Unknown9; - public float Scale1; - public LazyRow< BNpcBase > BNpcBase2; - public byte PartSlot2; - public bool Unknown13; - public bool Unknown14; - public bool Unknown15; - public bool Unknown16; - public float X2; - public float Y2; - public float Z2; - public short Unknown20; - public float Scale2; - public LazyRow< BNpcBase > BNpcBase3; - public byte PartSlot3; - public bool Unknown24; - public bool Unknown25; - public bool Unknown26; - public bool Unknown27; - public float X3; - public float Y3; - public float Z3; - public short Scale3; - public float Unknown32; - public LazyRow< BNpcBase > BNpcBase4; - public byte PartSlot4; - public bool Unknown35; - public bool Unknown36; - public bool Unknown37; - public bool Unknown38; - public float X4; - public float Y4; - public float Z4; - public short Unknown42; - public float Scale4; - public LazyRow< BNpcBase > BNpcBase5; - public byte PartSlot5; - public bool Unknown46; - public bool Unknown47; - public bool Unknown48; - public bool Unknown49; - public float X5; - public float Y5; - public float Z5; - public short Unknown53; - public float Scale5; + public LazyRow< BNpcBase > BNpcBase1 { get; set; } + public byte PartSlot1 { get; set; } + public bool Unknown2 { get; set; } + public bool Unknown3 { get; set; } + public bool Unknown4 { get; set; } + public bool Unknown5 { get; set; } + public float X1 { get; set; } + public float Y1 { get; set; } + public float Z1 { get; set; } + public short Unknown9 { get; set; } + public float Scale1 { get; set; } + public LazyRow< BNpcBase > BNpcBase2 { get; set; } + public byte PartSlot2 { get; set; } + public bool Unknown13 { get; set; } + public bool Unknown14 { get; set; } + public bool Unknown15 { get; set; } + public bool Unknown16 { get; set; } + public float X2 { get; set; } + public float Y2 { get; set; } + public float Z2 { get; set; } + public short Unknown20 { get; set; } + public float Scale2 { get; set; } + public LazyRow< BNpcBase > BNpcBase3 { get; set; } + public byte PartSlot3 { get; set; } + public bool Unknown24 { get; set; } + public bool Unknown25 { get; set; } + public bool Unknown26 { get; set; } + public bool Unknown27 { get; set; } + public float X3 { get; set; } + public float Y3 { get; set; } + public float Z3 { get; set; } + public short Scale3 { get; set; } + public float Unknown32 { get; set; } + public LazyRow< BNpcBase > BNpcBase4 { get; set; } + public byte PartSlot4 { get; set; } + public bool Unknown35 { get; set; } + public bool Unknown36 { get; set; } + public bool Unknown37 { get; set; } + public bool Unknown38 { get; set; } + public float X4 { get; set; } + public float Y4 { get; set; } + public float Z4 { get; set; } + public short Unknown42 { get; set; } + public float Scale4 { get; set; } + public LazyRow< BNpcBase > BNpcBase5 { get; set; } + public byte PartSlot5 { get; set; } + public bool Unknown46 { get; set; } + public bool Unknown47 { get; set; } + public bool Unknown48 { get; set; } + public bool Unknown49 { get; set; } + public float X5 { get; set; } + public float Y5 { get; set; } + public float Z5 { get; set; } + public short Unknown53 { get; set; } + public float Scale5 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - BNpcBase1 = new LazyRow< BNpcBase >( lumina, parser.ReadColumn< ushort >( 0 ), language ); + BNpcBase1 = new LazyRow< BNpcBase >( gameData, parser.ReadColumn< ushort >( 0 ), language ); PartSlot1 = parser.ReadColumn< byte >( 1 ); Unknown2 = parser.ReadColumn< bool >( 2 ); Unknown3 = parser.ReadColumn< bool >( 3 ); @@ -85,7 +81,7 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) Z1 = parser.ReadColumn< float >( 8 ); Unknown9 = parser.ReadColumn< short >( 9 ); Scale1 = parser.ReadColumn< float >( 10 ); - BNpcBase2 = new LazyRow< BNpcBase >( lumina, parser.ReadColumn< ushort >( 11 ), language ); + BNpcBase2 = new LazyRow< BNpcBase >( gameData, parser.ReadColumn< ushort >( 11 ), language ); PartSlot2 = parser.ReadColumn< byte >( 12 ); Unknown13 = parser.ReadColumn< bool >( 13 ); Unknown14 = parser.ReadColumn< bool >( 14 ); @@ -96,7 +92,7 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) Z2 = parser.ReadColumn< float >( 19 ); Unknown20 = parser.ReadColumn< short >( 20 ); Scale2 = parser.ReadColumn< float >( 21 ); - BNpcBase3 = new LazyRow< BNpcBase >( lumina, parser.ReadColumn< ushort >( 22 ), language ); + BNpcBase3 = new LazyRow< BNpcBase >( gameData, parser.ReadColumn< ushort >( 22 ), language ); PartSlot3 = parser.ReadColumn< byte >( 23 ); Unknown24 = parser.ReadColumn< bool >( 24 ); Unknown25 = parser.ReadColumn< bool >( 25 ); @@ -107,7 +103,7 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) Z3 = parser.ReadColumn< float >( 30 ); Scale3 = parser.ReadColumn< short >( 31 ); Unknown32 = parser.ReadColumn< float >( 32 ); - BNpcBase4 = new LazyRow< BNpcBase >( lumina, parser.ReadColumn< ushort >( 33 ), language ); + BNpcBase4 = new LazyRow< BNpcBase >( gameData, parser.ReadColumn< ushort >( 33 ), language ); PartSlot4 = parser.ReadColumn< byte >( 34 ); Unknown35 = parser.ReadColumn< bool >( 35 ); Unknown36 = parser.ReadColumn< bool >( 36 ); @@ -118,7 +114,7 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) Z4 = parser.ReadColumn< float >( 41 ); Unknown42 = parser.ReadColumn< short >( 42 ); Scale4 = parser.ReadColumn< float >( 43 ); - BNpcBase5 = new LazyRow< BNpcBase >( lumina, parser.ReadColumn< ushort >( 44 ), language ); + BNpcBase5 = new LazyRow< BNpcBase >( gameData, parser.ReadColumn< ushort >( 44 ), language ); PartSlot5 = parser.ReadColumn< byte >( 45 ); Unknown46 = parser.ReadColumn< bool >( 46 ); Unknown47 = parser.ReadColumn< bool >( 47 ); diff --git a/src/Lumina.Excel/GeneratedSheets/BNpcState.cs b/src/Lumina.Excel/GeneratedSheets/BNpcState.cs index 4e5d217e..2a2901f4 100644 --- a/src/Lumina.Excel/GeneratedSheets/BNpcState.cs +++ b/src/Lumina.Excel/GeneratedSheets/BNpcState.cs @@ -7,32 +7,28 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "BNpcState", columnHash: 0x439de63e )] - public class BNpcState : IExcelRow + public class BNpcState : ExcelRow { - public byte Slot; - public sbyte OverRay; - public sbyte Unknown2; - public byte Unknown3; - public ushort Idle; - public byte Attribute0; - public bool AttributeFlag0; - public byte Attribute1; - public bool AttributeFlag1; - public byte Attribute2; - public bool AttributeFlag2; - public float Scale; - public byte Unknown12; - public int LoopTimeline; - public bool Unknown14; + public byte Slot { get; set; } + public sbyte OverRay { get; set; } + public sbyte Unknown2 { get; set; } + public byte Unknown3 { get; set; } + public ushort Idle { get; set; } + public byte Attribute0 { get; set; } + public bool AttributeFlag0 { get; set; } + public byte Attribute1 { get; set; } + public bool AttributeFlag1 { get; set; } + public byte Attribute2 { get; set; } + public bool AttributeFlag2 { get; set; } + public float Scale { get; set; } + public byte Unknown12 { get; set; } + public int LoopTimeline { get; set; } + public bool Unknown14 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Slot = parser.ReadColumn< byte >( 0 ); OverRay = parser.ReadColumn< sbyte >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/BacklightColor.cs b/src/Lumina.Excel/GeneratedSheets/BacklightColor.cs index df59b3f0..edeb0dd1 100644 --- a/src/Lumina.Excel/GeneratedSheets/BacklightColor.cs +++ b/src/Lumina.Excel/GeneratedSheets/BacklightColor.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "BacklightColor", columnHash: 0xdbf43666 )] - public class BacklightColor : IExcelRow + public class BacklightColor : ExcelRow { - public uint Color; + public uint Color { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Color = parser.ReadColumn< uint >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/Ballista.cs b/src/Lumina.Excel/GeneratedSheets/Ballista.cs index 83dfab77..529fe51b 100644 --- a/src/Lumina.Excel/GeneratedSheets/Ballista.cs +++ b/src/Lumina.Excel/GeneratedSheets/Ballista.cs @@ -7,40 +7,36 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Ballista", columnHash: 0xcac0c160 )] - public class Ballista : IExcelRow + public class Ballista : ExcelRow { - public LazyRow< BNpcBase > BNPC; - public sbyte Near; - public sbyte Far; - public ushort Angle; - public byte Bullet; - public byte Unknown5; - public byte Unknown6; - public LazyRow< Action > Action0; - public LazyRow< Action > Action1; - public LazyRow< Action > Action2; - public LazyRow< Action > Action3; + public LazyRow< BNpcBase > BNPC { get; set; } + public sbyte Near { get; set; } + public sbyte Far { get; set; } + public ushort Angle { get; set; } + public byte Bullet { get; set; } + public byte Unknown5 { get; set; } + public byte Unknown6 { get; set; } + public LazyRow< Action > Action0 { get; set; } + public LazyRow< Action > Action1 { get; set; } + public LazyRow< Action > Action2 { get; set; } + public LazyRow< Action > Action3 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - BNPC = new LazyRow< BNpcBase >( lumina, parser.ReadColumn< ushort >( 0 ), language ); + BNPC = new LazyRow< BNpcBase >( gameData, parser.ReadColumn< ushort >( 0 ), language ); Near = parser.ReadColumn< sbyte >( 1 ); Far = parser.ReadColumn< sbyte >( 2 ); Angle = parser.ReadColumn< ushort >( 3 ); Bullet = parser.ReadColumn< byte >( 4 ); Unknown5 = parser.ReadColumn< byte >( 5 ); Unknown6 = parser.ReadColumn< byte >( 6 ); - Action0 = new LazyRow< Action >( lumina, parser.ReadColumn< ushort >( 7 ), language ); - Action1 = new LazyRow< Action >( lumina, parser.ReadColumn< ushort >( 8 ), language ); - Action2 = new LazyRow< Action >( lumina, parser.ReadColumn< ushort >( 9 ), language ); - Action3 = new LazyRow< Action >( lumina, parser.ReadColumn< ushort >( 10 ), language ); + Action0 = new LazyRow< Action >( gameData, parser.ReadColumn< ushort >( 7 ), language ); + Action1 = new LazyRow< Action >( gameData, parser.ReadColumn< ushort >( 8 ), language ); + Action2 = new LazyRow< Action >( gameData, parser.ReadColumn< ushort >( 9 ), language ); + Action3 = new LazyRow< Action >( gameData, parser.ReadColumn< ushort >( 10 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/Balloon.cs b/src/Lumina.Excel/GeneratedSheets/Balloon.cs index 4d07997b..a64dd6d5 100644 --- a/src/Lumina.Excel/GeneratedSheets/Balloon.cs +++ b/src/Lumina.Excel/GeneratedSheets/Balloon.cs @@ -7,19 +7,15 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Balloon", columnHash: 0x9d1b5f4b )] - public class Balloon : IExcelRow + public class Balloon : ExcelRow { - public bool Slowly; - public SeString Dialogue; + public bool Slowly { get; set; } + public SeString Dialogue { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Slowly = parser.ReadColumn< bool >( 0 ); Dialogue = parser.ReadColumn< SeString >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/BaseParam.cs b/src/Lumina.Excel/GeneratedSheets/BaseParam.cs index 284ce5b3..b9ab569c 100644 --- a/src/Lumina.Excel/GeneratedSheets/BaseParam.cs +++ b/src/Lumina.Excel/GeneratedSheets/BaseParam.cs @@ -7,44 +7,40 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "BaseParam", columnHash: 0xedef6dbb )] - public class BaseParam : IExcelRow + public class BaseParam : ExcelRow { - public sbyte PacketIndex; - public SeString Name; - public SeString Description; - public byte OrderPriority; - public byte oneHWpnPct; - public byte OHPct; - public byte HeadPct; - public byte ChestPct; - public byte HandsPct; - public byte WaistPct; - public byte LegsPct; - public byte FeetPct; - public byte EarringPct; - public byte NecklacePct; - public byte BraceletPct; - public byte RingPct; - public byte twoHWpnPct; - public byte UnderArmorPct; - public byte ChestHeadPct; - public byte ChestHeadLegsFeetPct; - public byte Unknown20; - public byte LegsFeetPct; - public byte HeadChestHandsLegsFeetPct; - public byte ChestLegsGlovesPct; - public byte ChestLegsFeetPct; - public byte[] MeldParam; - public bool Unknown38; + public sbyte PacketIndex { get; set; } + public SeString Name { get; set; } + public SeString Description { get; set; } + public byte OrderPriority { get; set; } + public byte oneHWpnPct { get; set; } + public byte OHPct { get; set; } + public byte HeadPct { get; set; } + public byte ChestPct { get; set; } + public byte HandsPct { get; set; } + public byte WaistPct { get; set; } + public byte LegsPct { get; set; } + public byte FeetPct { get; set; } + public byte EarringPct { get; set; } + public byte NecklacePct { get; set; } + public byte BraceletPct { get; set; } + public byte RingPct { get; set; } + public byte twoHWpnPct { get; set; } + public byte UnderArmorPct { get; set; } + public byte ChestHeadPct { get; set; } + public byte ChestHeadLegsFeetPct { get; set; } + public byte Unknown20 { get; set; } + public byte LegsFeetPct { get; set; } + public byte HeadChestHandsLegsFeetPct { get; set; } + public byte ChestLegsGlovesPct { get; set; } + public byte ChestLegsFeetPct { get; set; } + public byte[] MeldParam { get; set; } + public bool Unknown38 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); PacketIndex = parser.ReadColumn< sbyte >( 0 ); Name = parser.ReadColumn< SeString >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/BattleLeve.cs b/src/Lumina.Excel/GeneratedSheets/BattleLeve.cs index e20185a3..165edf6b 100644 --- a/src/Lumina.Excel/GeneratedSheets/BattleLeve.cs +++ b/src/Lumina.Excel/GeneratedSheets/BattleLeve.cs @@ -7,7 +7,7 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "BattleLeve", columnHash: 0x1ce99cea )] - public class BattleLeve : IExcelRow + public class BattleLeve : ExcelRow { public struct UnkStruct64Struct { @@ -18,123 +18,119 @@ public struct UnkStruct104Struct public byte NumOfAppearance; } - public ushort[] Time; - public int[] BaseID; - public ushort[] EnemyLevel; - public LazyRow< BNpcName >[] BNpcName; - public LazyRow< EventItem >[] ItemsInvolved; - public byte[] ItemsInvolvedQty; - public byte[] ItemDropRate; - public uint[] ToDoNumberInvolved; - public UnkStruct64Struct[] UnkStruct64; - public uint Unknown69; - public uint Unknown70; - public uint Unknown71; - public uint Unknown72; - public uint Unknown73; - public uint Unknown74; - public uint Unknown75; - public uint Unknown76; - public uint Unknown77; - public uint Unknown78; - public uint Unknown79; - public uint Unknown80; - public uint Unknown81; - public uint Unknown82; - public uint Unknown83; - public uint Unknown84; - public uint Unknown85; - public uint Unknown86; - public uint Unknown87; - public uint Unknown88; - public uint Unknown89; - public uint Unknown90; - public uint Unknown91; - public uint Unknown92; - public uint Unknown93; - public uint Unknown94; - public uint Unknown95; - public uint Unknown96; - public uint Unknown97; - public uint Unknown98; - public uint Unknown99; - public uint Unknown100; - public uint Unknown101; - public uint Unknown102; - public uint Unknown103; - public UnkStruct104Struct[] UnkStruct104; - public byte Unknown112; - public byte Unknown113; - public byte Unknown114; - public byte Unknown115; - public byte Unknown116; - public byte Unknown117; - public byte Unknown118; - public byte Unknown119; - public byte Unknown120; - public byte Unknown121; - public byte Unknown122; - public byte Unknown123; - public byte Unknown124; - public byte Unknown125; - public byte Unknown126; - public byte Unknown127; - public byte Unknown128; - public byte Unknown129; - public byte Unknown130; - public byte Unknown131; - public byte Unknown132; - public byte Unknown133; - public byte Unknown134; - public byte Unknown135; - public byte Unknown136; - public byte Unknown137; - public byte Unknown138; - public byte Unknown139; - public byte Unknown140; - public byte Unknown141; - public byte Unknown142; - public byte Unknown143; - public byte Unknown144; - public byte Unknown145; - public byte Unknown146; - public byte Unknown147; - public byte Unknown148; - public byte Unknown149; - public byte Unknown150; - public byte Unknown151; - public byte Unknown152; - public byte Unknown153; - public byte Unknown154; - public byte Unknown155; - public byte Unknown156; - public byte Unknown157; - public byte Unknown158; - public byte Unknown159; - public byte Unknown160; - public byte Unknown161; - public byte Unknown162; - public byte Unknown163; - public byte Unknown164; - public byte Unknown165; - public byte Unknown166; - public byte Unknown167; - public byte[] ToDoSequence; - public LazyRow< BattleLeveRule > Rule; - public byte Varient; - public LazyRow< LeveString > Objective0; - public LazyRow< LeveString > Objective1; - public LazyRow< LeveString > Objective2; - public ushort Help0; - public ushort Help1; + public ushort[] Time { get; set; } + public int[] BaseID { get; set; } + public ushort[] EnemyLevel { get; set; } + public LazyRow< BNpcName >[] BNpcName { get; set; } + public LazyRow< EventItem >[] ItemsInvolved { get; set; } + public byte[] ItemsInvolvedQty { get; set; } + public byte[] ItemDropRate { get; set; } + public uint[] ToDoNumberInvolved { get; set; } + public UnkStruct64Struct[] UnkStruct64 { get; set; } + public uint Unknown69 { get; set; } + public uint Unknown70 { get; set; } + public uint Unknown71 { get; set; } + public uint Unknown72 { get; set; } + public uint Unknown73 { get; set; } + public uint Unknown74 { get; set; } + public uint Unknown75 { get; set; } + public uint Unknown76 { get; set; } + public uint Unknown77 { get; set; } + public uint Unknown78 { get; set; } + public uint Unknown79 { get; set; } + public uint Unknown80 { get; set; } + public uint Unknown81 { get; set; } + public uint Unknown82 { get; set; } + public uint Unknown83 { get; set; } + public uint Unknown84 { get; set; } + public uint Unknown85 { get; set; } + public uint Unknown86 { get; set; } + public uint Unknown87 { get; set; } + public uint Unknown88 { get; set; } + public uint Unknown89 { get; set; } + public uint Unknown90 { get; set; } + public uint Unknown91 { get; set; } + public uint Unknown92 { get; set; } + public uint Unknown93 { get; set; } + public uint Unknown94 { get; set; } + public uint Unknown95 { get; set; } + public uint Unknown96 { get; set; } + public uint Unknown97 { get; set; } + public uint Unknown98 { get; set; } + public uint Unknown99 { get; set; } + public uint Unknown100 { get; set; } + public uint Unknown101 { get; set; } + public uint Unknown102 { get; set; } + public uint Unknown103 { get; set; } + public UnkStruct104Struct[] UnkStruct104 { get; set; } + public byte Unknown112 { get; set; } + public byte Unknown113 { get; set; } + public byte Unknown114 { get; set; } + public byte Unknown115 { get; set; } + public byte Unknown116 { get; set; } + public byte Unknown117 { get; set; } + public byte Unknown118 { get; set; } + public byte Unknown119 { get; set; } + public byte Unknown120 { get; set; } + public byte Unknown121 { get; set; } + public byte Unknown122 { get; set; } + public byte Unknown123 { get; set; } + public byte Unknown124 { get; set; } + public byte Unknown125 { get; set; } + public byte Unknown126 { get; set; } + public byte Unknown127 { get; set; } + public byte Unknown128 { get; set; } + public byte Unknown129 { get; set; } + public byte Unknown130 { get; set; } + public byte Unknown131 { get; set; } + public byte Unknown132 { get; set; } + public byte Unknown133 { get; set; } + public byte Unknown134 { get; set; } + public byte Unknown135 { get; set; } + public byte Unknown136 { get; set; } + public byte Unknown137 { get; set; } + public byte Unknown138 { get; set; } + public byte Unknown139 { get; set; } + public byte Unknown140 { get; set; } + public byte Unknown141 { get; set; } + public byte Unknown142 { get; set; } + public byte Unknown143 { get; set; } + public byte Unknown144 { get; set; } + public byte Unknown145 { get; set; } + public byte Unknown146 { get; set; } + public byte Unknown147 { get; set; } + public byte Unknown148 { get; set; } + public byte Unknown149 { get; set; } + public byte Unknown150 { get; set; } + public byte Unknown151 { get; set; } + public byte Unknown152 { get; set; } + public byte Unknown153 { get; set; } + public byte Unknown154 { get; set; } + public byte Unknown155 { get; set; } + public byte Unknown156 { get; set; } + public byte Unknown157 { get; set; } + public byte Unknown158 { get; set; } + public byte Unknown159 { get; set; } + public byte Unknown160 { get; set; } + public byte Unknown161 { get; set; } + public byte Unknown162 { get; set; } + public byte Unknown163 { get; set; } + public byte Unknown164 { get; set; } + public byte Unknown165 { get; set; } + public byte Unknown166 { get; set; } + public byte Unknown167 { get; set; } + public byte[] ToDoSequence { get; set; } + public LazyRow< BattleLeveRule > Rule { get; set; } + public byte Varient { get; set; } + public LazyRow< LeveString > Objective0 { get; set; } + public LazyRow< LeveString > Objective1 { get; set; } + public LazyRow< LeveString > Objective2 { get; set; } + public ushort Help0 { get; set; } + public ushort Help1 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Time = new ushort[ 8 ]; for( var i = 0; i < 8; i++ ) @@ -147,10 +143,10 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) EnemyLevel[ i ] = parser.ReadColumn< ushort >( 16 + i ); BNpcName = new LazyRow< BNpcName >[ 8 ]; for( var i = 0; i < 8; i++ ) - BNpcName[ i ] = new LazyRow< BNpcName >( lumina, parser.ReadColumn< uint >( 24 + i ), language ); + BNpcName[ i ] = new LazyRow< BNpcName >( gameData, parser.ReadColumn< uint >( 24 + i ), language ); ItemsInvolved = new LazyRow< EventItem >[ 8 ]; for( var i = 0; i < 8; i++ ) - ItemsInvolved[ i ] = new LazyRow< EventItem >( lumina, parser.ReadColumn< int >( 32 + i ), language ); + ItemsInvolved[ i ] = new LazyRow< EventItem >( gameData, parser.ReadColumn< int >( 32 + i ), language ); ItemsInvolvedQty = new byte[ 8 ]; for( var i = 0; i < 8; i++ ) ItemsInvolvedQty[ i ] = parser.ReadColumn< byte >( 40 + i ); @@ -266,11 +262,11 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) ToDoSequence = new byte[ 8 ]; for( var i = 0; i < 8; i++ ) ToDoSequence[ i ] = parser.ReadColumn< byte >( 168 + i ); - Rule = new LazyRow< BattleLeveRule >( lumina, parser.ReadColumn< int >( 176 ), language ); + Rule = new LazyRow< BattleLeveRule >( gameData, parser.ReadColumn< int >( 176 ), language ); Varient = parser.ReadColumn< byte >( 177 ); - Objective0 = new LazyRow< LeveString >( lumina, parser.ReadColumn< ushort >( 178 ), language ); - Objective1 = new LazyRow< LeveString >( lumina, parser.ReadColumn< ushort >( 179 ), language ); - Objective2 = new LazyRow< LeveString >( lumina, parser.ReadColumn< ushort >( 180 ), language ); + Objective0 = new LazyRow< LeveString >( gameData, parser.ReadColumn< ushort >( 178 ), language ); + Objective1 = new LazyRow< LeveString >( gameData, parser.ReadColumn< ushort >( 179 ), language ); + Objective2 = new LazyRow< LeveString >( gameData, parser.ReadColumn< ushort >( 180 ), language ); Help0 = parser.ReadColumn< ushort >( 181 ); Help1 = parser.ReadColumn< ushort >( 182 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/BattleLeveRule.cs b/src/Lumina.Excel/GeneratedSheets/BattleLeveRule.cs index cec43d79..da1632c2 100644 --- a/src/Lumina.Excel/GeneratedSheets/BattleLeveRule.cs +++ b/src/Lumina.Excel/GeneratedSheets/BattleLeveRule.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "BattleLeveRule", columnHash: 0xdebb20e3 )] - public class BattleLeveRule : IExcelRow + public class BattleLeveRule : ExcelRow { - public SeString Rule; + public SeString Rule { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Rule = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/BeastRankBonus.cs b/src/Lumina.Excel/GeneratedSheets/BeastRankBonus.cs index 1cea9a40..8da1eb9e 100644 --- a/src/Lumina.Excel/GeneratedSheets/BeastRankBonus.cs +++ b/src/Lumina.Excel/GeneratedSheets/BeastRankBonus.cs @@ -7,27 +7,23 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "BeastRankBonus", columnHash: 0x4d6cbdc3 )] - public class BeastRankBonus : IExcelRow + public class BeastRankBonus : ExcelRow { - public ushort Neutral; - public ushort Recognized; - public ushort Friendly; - public ushort Trusted; - public ushort Respected; - public ushort Honored; - public ushort Sworn; - public ushort AlliedBloodsworn; - public LazyRow< Item > Item; - public byte[] ItemQuantity; + public ushort Neutral { get; set; } + public ushort Recognized { get; set; } + public ushort Friendly { get; set; } + public ushort Trusted { get; set; } + public ushort Respected { get; set; } + public ushort Honored { get; set; } + public ushort Sworn { get; set; } + public ushort AlliedBloodsworn { get; set; } + public LazyRow< Item > Item { get; set; } + public byte[] ItemQuantity { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Neutral = parser.ReadColumn< ushort >( 0 ); Recognized = parser.ReadColumn< ushort >( 1 ); @@ -37,7 +33,7 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) Honored = parser.ReadColumn< ushort >( 5 ); Sworn = parser.ReadColumn< ushort >( 6 ); AlliedBloodsworn = parser.ReadColumn< ushort >( 7 ); - Item = new LazyRow< Item >( lumina, parser.ReadColumn< uint >( 8 ), language ); + Item = new LazyRow< Item >( gameData, parser.ReadColumn< uint >( 8 ), language ); ItemQuantity = new byte[ 8 ]; for( var i = 0; i < 8; i++ ) ItemQuantity[ i ] = parser.ReadColumn< byte >( 9 + i ); diff --git a/src/Lumina.Excel/GeneratedSheets/BeastReputationRank.cs b/src/Lumina.Excel/GeneratedSheets/BeastReputationRank.cs index 7514a7cf..542fbb2c 100644 --- a/src/Lumina.Excel/GeneratedSheets/BeastReputationRank.cs +++ b/src/Lumina.Excel/GeneratedSheets/BeastReputationRank.cs @@ -7,26 +7,22 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "BeastReputationRank", columnHash: 0x446d8bad )] - public class BeastReputationRank : IExcelRow + public class BeastReputationRank : ExcelRow { - public ushort RequiredReputation; - public SeString Name; - public SeString AlliedNames; - public LazyRow< UIColor > Color; + public ushort RequiredReputation { get; set; } + public SeString Name { get; set; } + public SeString AlliedNames { get; set; } + public LazyRow< UIColor > Color { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); RequiredReputation = parser.ReadColumn< ushort >( 0 ); Name = parser.ReadColumn< SeString >( 1 ); AlliedNames = parser.ReadColumn< SeString >( 2 ); - Color = new LazyRow< UIColor >( lumina, parser.ReadColumn< uint >( 3 ), language ); + Color = new LazyRow< UIColor >( gameData, parser.ReadColumn< uint >( 3 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/BeastTribe.cs b/src/Lumina.Excel/GeneratedSheets/BeastTribe.cs index 8752a9fe..7c788c0e 100644 --- a/src/Lumina.Excel/GeneratedSheets/BeastTribe.cs +++ b/src/Lumina.Excel/GeneratedSheets/BeastTribe.cs @@ -7,44 +7,40 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "BeastTribe", columnHash: 0x336849f0 )] - public class BeastTribe : IExcelRow + public class BeastTribe : ExcelRow { - public bool Unknown0; - public byte MinLevel; - public LazyRow< BeastRankBonus > BeastRankBonus; - public uint IconReputation; - public uint Icon; - public byte MaxRank; - public LazyRow< ExVersion > Expansion; - public LazyRow< Item > CurrencyItem; - public byte DisplayOrder; - public SeString Name; - public sbyte Adjective; - public SeString Plural; - public sbyte PossessivePronoun; - public sbyte StartsWithVowel; - public sbyte Pronoun; - public sbyte Article; - public sbyte DEF; - public SeString NameRelation; + public bool Unknown0 { get; set; } + public byte MinLevel { get; set; } + public LazyRow< BeastRankBonus > BeastRankBonus { get; set; } + public uint IconReputation { get; set; } + public uint Icon { get; set; } + public byte MaxRank { get; set; } + public LazyRow< ExVersion > Expansion { get; set; } + public LazyRow< Item > CurrencyItem { get; set; } + public byte DisplayOrder { get; set; } + public SeString Name { get; set; } + public sbyte Adjective { get; set; } + public SeString Plural { get; set; } + public sbyte PossessivePronoun { get; set; } + public sbyte StartsWithVowel { get; set; } + public sbyte Pronoun { get; set; } + public sbyte Article { get; set; } + public sbyte DEF { get; set; } + public SeString NameRelation { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< bool >( 0 ); MinLevel = parser.ReadColumn< byte >( 1 ); - BeastRankBonus = new LazyRow< BeastRankBonus >( lumina, parser.ReadColumn< byte >( 2 ), language ); + BeastRankBonus = new LazyRow< BeastRankBonus >( gameData, parser.ReadColumn< byte >( 2 ), language ); IconReputation = parser.ReadColumn< uint >( 3 ); Icon = parser.ReadColumn< uint >( 4 ); MaxRank = parser.ReadColumn< byte >( 5 ); - Expansion = new LazyRow< ExVersion >( lumina, parser.ReadColumn< byte >( 6 ), language ); - CurrencyItem = new LazyRow< Item >( lumina, parser.ReadColumn< uint >( 7 ), language ); + Expansion = new LazyRow< ExVersion >( gameData, parser.ReadColumn< byte >( 6 ), language ); + CurrencyItem = new LazyRow< Item >( gameData, parser.ReadColumn< uint >( 7 ), language ); DisplayOrder = parser.ReadColumn< byte >( 8 ); Name = parser.ReadColumn< SeString >( 9 ); Adjective = parser.ReadColumn< sbyte >( 10 ); diff --git a/src/Lumina.Excel/GeneratedSheets/Behavior.cs b/src/Lumina.Excel/GeneratedSheets/Behavior.cs index 8d9d4f19..6b5e89a1 100644 --- a/src/Lumina.Excel/GeneratedSheets/Behavior.cs +++ b/src/Lumina.Excel/GeneratedSheets/Behavior.cs @@ -7,40 +7,36 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Behavior", columnHash: 0x858a7450 )] - public class Behavior : IExcelRow + public class Behavior : ExcelRow { - public byte Unknown0; - public byte Unknown1; - public byte Condition0Target; - public byte Condition0Type; - public LazyRow< Balloon > Balloon; - public short Unknown5; - public int Unknown6; - public ushort Unknown7; - public ushort Unknown8; - public byte Condition1Target; - public byte Condition1Type; - public uint ContentArgument0; - public byte ContentArgument1; - public byte Unknown13; - public byte Unknown14; - public uint Unknown15; - public ushort Unknown16; + public byte Unknown0 { get; set; } + public byte Unknown1 { get; set; } + public byte Condition0Target { get; set; } + public byte Condition0Type { get; set; } + public LazyRow< Balloon > Balloon { get; set; } + public short Unknown5 { get; set; } + public int Unknown6 { get; set; } + public ushort Unknown7 { get; set; } + public ushort Unknown8 { get; set; } + public byte Condition1Target { get; set; } + public byte Condition1Type { get; set; } + public uint ContentArgument0 { get; set; } + public byte ContentArgument1 { get; set; } + public byte Unknown13 { get; set; } + public byte Unknown14 { get; set; } + public uint Unknown15 { get; set; } + public ushort Unknown16 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< byte >( 0 ); Unknown1 = parser.ReadColumn< byte >( 1 ); Condition0Target = parser.ReadColumn< byte >( 2 ); Condition0Type = parser.ReadColumn< byte >( 3 ); - Balloon = new LazyRow< Balloon >( lumina, parser.ReadColumn< int >( 4 ), language ); + Balloon = new LazyRow< Balloon >( gameData, parser.ReadColumn< int >( 4 ), language ); Unknown5 = parser.ReadColumn< short >( 5 ); Unknown6 = parser.ReadColumn< int >( 6 ); Unknown7 = parser.ReadColumn< ushort >( 7 ); diff --git a/src/Lumina.Excel/GeneratedSheets/BehaviorPath.cs b/src/Lumina.Excel/GeneratedSheets/BehaviorPath.cs index d84025ce..ad14f7da 100644 --- a/src/Lumina.Excel/GeneratedSheets/BehaviorPath.cs +++ b/src/Lumina.Excel/GeneratedSheets/BehaviorPath.cs @@ -7,23 +7,19 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "BehaviorPath", columnHash: 0x96572d0d )] - public class BehaviorPath : IExcelRow + public class BehaviorPath : ExcelRow { - public bool IsTurnTransition; - public bool IsFadeOut; - public bool IsFadeIn; - public bool IsWalking; - public bool Unknown4; - public float Speed; + public bool IsTurnTransition { get; set; } + public bool IsFadeOut { get; set; } + public bool IsFadeIn { get; set; } + public bool IsWalking { get; set; } + public bool Unknown4 { get; set; } + public float Speed { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); IsTurnTransition = parser.ReadColumn< bool >( 0 ); IsFadeOut = parser.ReadColumn< bool >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/BenchmarkOverrideEquipment.cs b/src/Lumina.Excel/GeneratedSheets/BenchmarkOverrideEquipment.cs index 99d394f8..dfc447bf 100644 --- a/src/Lumina.Excel/GeneratedSheets/BenchmarkOverrideEquipment.cs +++ b/src/Lumina.Excel/GeneratedSheets/BenchmarkOverrideEquipment.cs @@ -7,78 +7,74 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "BenchmarkOverrideEquipment", columnHash: 0xd0ed99de )] - public class BenchmarkOverrideEquipment : IExcelRow + public class BenchmarkOverrideEquipment : ExcelRow { - public uint Unknown0; - public uint Unknown1; - public byte Unknown2; - public sbyte Unknown3; - public ulong ModelMainHand; - public LazyRow< Stain > DyeMainHand; - public ulong ModelOffHand; - public LazyRow< Stain > DyeOffHand; - public ulong Unknown8; - public byte Unknown9; - public uint ModelHead; - public LazyRow< Stain > DyeHead; - public uint ModelBody; - public LazyRow< Stain > DyeBody; - public uint ModelHands; - public LazyRow< Stain > DyeHands; - public uint ModelLegs; - public LazyRow< Stain > DyeLegs; - public uint ModelFeet; - public LazyRow< Stain > DyeFeet; - public uint ModelEars; - public LazyRow< Stain > DyeEars; - public uint ModelNeck; - public LazyRow< Stain > DyeNeck; - public uint ModelWrists; - public LazyRow< Stain > DyeWrists; - public uint ModelLeftRing; - public LazyRow< Stain > DyeLeftRing; - public uint ModelRightRing; - public LazyRow< Stain > DyeRightRing; + public uint Unknown0 { get; set; } + public uint Unknown1 { get; set; } + public byte Unknown2 { get; set; } + public sbyte Unknown3 { get; set; } + public ulong ModelMainHand { get; set; } + public LazyRow< Stain > DyeMainHand { get; set; } + public ulong ModelOffHand { get; set; } + public LazyRow< Stain > DyeOffHand { get; set; } + public ulong Unknown8 { get; set; } + public byte Unknown9 { get; set; } + public uint ModelHead { get; set; } + public LazyRow< Stain > DyeHead { get; set; } + public uint ModelBody { get; set; } + public LazyRow< Stain > DyeBody { get; set; } + public uint ModelHands { get; set; } + public LazyRow< Stain > DyeHands { get; set; } + public uint ModelLegs { get; set; } + public LazyRow< Stain > DyeLegs { get; set; } + public uint ModelFeet { get; set; } + public LazyRow< Stain > DyeFeet { get; set; } + public uint ModelEars { get; set; } + public LazyRow< Stain > DyeEars { get; set; } + public uint ModelNeck { get; set; } + public LazyRow< Stain > DyeNeck { get; set; } + public uint ModelWrists { get; set; } + public LazyRow< Stain > DyeWrists { get; set; } + public uint ModelLeftRing { get; set; } + public LazyRow< Stain > DyeLeftRing { get; set; } + public uint ModelRightRing { get; set; } + public LazyRow< Stain > DyeRightRing { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< uint >( 0 ); Unknown1 = parser.ReadColumn< uint >( 1 ); Unknown2 = parser.ReadColumn< byte >( 2 ); Unknown3 = parser.ReadColumn< sbyte >( 3 ); ModelMainHand = parser.ReadColumn< ulong >( 4 ); - DyeMainHand = new LazyRow< Stain >( lumina, parser.ReadColumn< byte >( 5 ), language ); + DyeMainHand = new LazyRow< Stain >( gameData, parser.ReadColumn< byte >( 5 ), language ); ModelOffHand = parser.ReadColumn< ulong >( 6 ); - DyeOffHand = new LazyRow< Stain >( lumina, parser.ReadColumn< byte >( 7 ), language ); + DyeOffHand = new LazyRow< Stain >( gameData, parser.ReadColumn< byte >( 7 ), language ); Unknown8 = parser.ReadColumn< ulong >( 8 ); Unknown9 = parser.ReadColumn< byte >( 9 ); ModelHead = parser.ReadColumn< uint >( 10 ); - DyeHead = new LazyRow< Stain >( lumina, parser.ReadColumn< byte >( 11 ), language ); + DyeHead = new LazyRow< Stain >( gameData, parser.ReadColumn< byte >( 11 ), language ); ModelBody = parser.ReadColumn< uint >( 12 ); - DyeBody = new LazyRow< Stain >( lumina, parser.ReadColumn< byte >( 13 ), language ); + DyeBody = new LazyRow< Stain >( gameData, parser.ReadColumn< byte >( 13 ), language ); ModelHands = parser.ReadColumn< uint >( 14 ); - DyeHands = new LazyRow< Stain >( lumina, parser.ReadColumn< byte >( 15 ), language ); + DyeHands = new LazyRow< Stain >( gameData, parser.ReadColumn< byte >( 15 ), language ); ModelLegs = parser.ReadColumn< uint >( 16 ); - DyeLegs = new LazyRow< Stain >( lumina, parser.ReadColumn< byte >( 17 ), language ); + DyeLegs = new LazyRow< Stain >( gameData, parser.ReadColumn< byte >( 17 ), language ); ModelFeet = parser.ReadColumn< uint >( 18 ); - DyeFeet = new LazyRow< Stain >( lumina, parser.ReadColumn< byte >( 19 ), language ); + DyeFeet = new LazyRow< Stain >( gameData, parser.ReadColumn< byte >( 19 ), language ); ModelEars = parser.ReadColumn< uint >( 20 ); - DyeEars = new LazyRow< Stain >( lumina, parser.ReadColumn< byte >( 21 ), language ); + DyeEars = new LazyRow< Stain >( gameData, parser.ReadColumn< byte >( 21 ), language ); ModelNeck = parser.ReadColumn< uint >( 22 ); - DyeNeck = new LazyRow< Stain >( lumina, parser.ReadColumn< byte >( 23 ), language ); + DyeNeck = new LazyRow< Stain >( gameData, parser.ReadColumn< byte >( 23 ), language ); ModelWrists = parser.ReadColumn< uint >( 24 ); - DyeWrists = new LazyRow< Stain >( lumina, parser.ReadColumn< byte >( 25 ), language ); + DyeWrists = new LazyRow< Stain >( gameData, parser.ReadColumn< byte >( 25 ), language ); ModelLeftRing = parser.ReadColumn< uint >( 26 ); - DyeLeftRing = new LazyRow< Stain >( lumina, parser.ReadColumn< byte >( 27 ), language ); + DyeLeftRing = new LazyRow< Stain >( gameData, parser.ReadColumn< byte >( 27 ), language ); ModelRightRing = parser.ReadColumn< uint >( 28 ); - DyeRightRing = new LazyRow< Stain >( lumina, parser.ReadColumn< byte >( 29 ), language ); + DyeRightRing = new LazyRow< Stain >( gameData, parser.ReadColumn< byte >( 29 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/Buddy.cs b/src/Lumina.Excel/GeneratedSheets/Buddy.cs index 424e72dd..236aafa6 100644 --- a/src/Lumina.Excel/GeneratedSheets/Buddy.cs +++ b/src/Lumina.Excel/GeneratedSheets/Buddy.cs @@ -7,29 +7,25 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Buddy", columnHash: 0xd2892cc5 )] - public class Buddy : IExcelRow + public class Buddy : ExcelRow { - public byte Base; - public LazyRow< Quest > QuestRequirement2; - public LazyRow< Quest > QuestRequirement1; - public int BaseEquip; - public SeString SoundEffect4; - public SeString SoundEffect3; - public SeString SoundEffect2; - public SeString SoundEffect1; + public byte Base { get; set; } + public LazyRow< Quest > QuestRequirement2 { get; set; } + public LazyRow< Quest > QuestRequirement1 { get; set; } + public int BaseEquip { get; set; } + public SeString SoundEffect4 { get; set; } + public SeString SoundEffect3 { get; set; } + public SeString SoundEffect2 { get; set; } + public SeString SoundEffect1 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Base = parser.ReadColumn< byte >( 0 ); - QuestRequirement2 = new LazyRow< Quest >( lumina, parser.ReadColumn< int >( 1 ), language ); - QuestRequirement1 = new LazyRow< Quest >( lumina, parser.ReadColumn< int >( 2 ), language ); + QuestRequirement2 = new LazyRow< Quest >( gameData, parser.ReadColumn< int >( 1 ), language ); + QuestRequirement1 = new LazyRow< Quest >( gameData, parser.ReadColumn< int >( 2 ), language ); BaseEquip = parser.ReadColumn< int >( 3 ); SoundEffect4 = parser.ReadColumn< SeString >( 4 ); SoundEffect3 = parser.ReadColumn< SeString >( 5 ); diff --git a/src/Lumina.Excel/GeneratedSheets/BuddyAction.cs b/src/Lumina.Excel/GeneratedSheets/BuddyAction.cs index 265a692d..dea26bf4 100644 --- a/src/Lumina.Excel/GeneratedSheets/BuddyAction.cs +++ b/src/Lumina.Excel/GeneratedSheets/BuddyAction.cs @@ -7,23 +7,19 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "BuddyAction", columnHash: 0x9a695bec )] - public class BuddyAction : IExcelRow + public class BuddyAction : ExcelRow { - public SeString Name; - public SeString Description; - public int Icon; - public int IconStatus; - public ushort Reward; - public byte Sort; + public SeString Name { get; set; } + public SeString Description { get; set; } + public int Icon { get; set; } + public int IconStatus { get; set; } + public ushort Reward { get; set; } + public byte Sort { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); Description = parser.ReadColumn< SeString >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/BuddyEquip.cs b/src/Lumina.Excel/GeneratedSheets/BuddyEquip.cs index 6f86624d..a0f410e2 100644 --- a/src/Lumina.Excel/GeneratedSheets/BuddyEquip.cs +++ b/src/Lumina.Excel/GeneratedSheets/BuddyEquip.cs @@ -7,34 +7,30 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "BuddyEquip", columnHash: 0xb429792a )] - public class BuddyEquip : IExcelRow + public class BuddyEquip : ExcelRow { - public SeString Singular; - public sbyte Adjective; - public SeString Plural; - public sbyte PossessivePronoun; - public sbyte StartsWithVowel; - public sbyte Unknown5; - public sbyte Pronoun; - public sbyte Article; - public SeString Name; - public int ModelTop; - public int ModelBody; - public int ModelLegs; - public LazyRow< GrandCompany > GrandCompany; - public ushort IconHead; - public ushort IconBody; - public ushort IconLegs; - public byte Unknown16; + public SeString Singular { get; set; } + public sbyte Adjective { get; set; } + public SeString Plural { get; set; } + public sbyte PossessivePronoun { get; set; } + public sbyte StartsWithVowel { get; set; } + public sbyte Unknown5 { get; set; } + public sbyte Pronoun { get; set; } + public sbyte Article { get; set; } + public SeString Name { get; set; } + public int ModelTop { get; set; } + public int ModelBody { get; set; } + public int ModelLegs { get; set; } + public LazyRow< GrandCompany > GrandCompany { get; set; } + public ushort IconHead { get; set; } + public ushort IconBody { get; set; } + public ushort IconLegs { get; set; } + public byte Order { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Singular = parser.ReadColumn< SeString >( 0 ); Adjective = parser.ReadColumn< sbyte >( 1 ); @@ -48,11 +44,11 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) ModelTop = parser.ReadColumn< int >( 9 ); ModelBody = parser.ReadColumn< int >( 10 ); ModelLegs = parser.ReadColumn< int >( 11 ); - GrandCompany = new LazyRow< GrandCompany >( lumina, parser.ReadColumn< byte >( 12 ), language ); + GrandCompany = new LazyRow< GrandCompany >( gameData, parser.ReadColumn< byte >( 12 ), language ); IconHead = parser.ReadColumn< ushort >( 13 ); IconBody = parser.ReadColumn< ushort >( 14 ); IconLegs = parser.ReadColumn< ushort >( 15 ); - Unknown16 = parser.ReadColumn< byte >( 16 ); + Order = parser.ReadColumn< byte >( 16 ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/BuddyItem.cs b/src/Lumina.Excel/GeneratedSheets/BuddyItem.cs index 6799dd3b..974cb13f 100644 --- a/src/Lumina.Excel/GeneratedSheets/BuddyItem.cs +++ b/src/Lumina.Excel/GeneratedSheets/BuddyItem.cs @@ -7,24 +7,20 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "BuddyItem", columnHash: 0xfa9fc03d )] - public class BuddyItem : IExcelRow + public class BuddyItem : ExcelRow { - public LazyRow< Item > Item; - public bool UseField; - public bool UseTraining; - public bool Unknown3; - public byte Status; + public LazyRow< Item > Item { get; set; } + public bool UseField { get; set; } + public bool UseTraining { get; set; } + public bool Unknown3 { get; set; } + public byte Status { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Item = new LazyRow< Item >( lumina, parser.ReadColumn< ushort >( 0 ), language ); + Item = new LazyRow< Item >( gameData, parser.ReadColumn< ushort >( 0 ), language ); UseField = parser.ReadColumn< bool >( 1 ); UseTraining = parser.ReadColumn< bool >( 2 ); Unknown3 = parser.ReadColumn< bool >( 3 ); diff --git a/src/Lumina.Excel/GeneratedSheets/BuddyRank.cs b/src/Lumina.Excel/GeneratedSheets/BuddyRank.cs index 8eae5cab..89bec3c1 100644 --- a/src/Lumina.Excel/GeneratedSheets/BuddyRank.cs +++ b/src/Lumina.Excel/GeneratedSheets/BuddyRank.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "BuddyRank", columnHash: 0xdbf43666 )] - public class BuddyRank : IExcelRow + public class BuddyRank : ExcelRow { - public uint ExpRequired; + public uint ExpRequired { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); ExpRequired = parser.ReadColumn< uint >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/BuddySkill.cs b/src/Lumina.Excel/GeneratedSheets/BuddySkill.cs index d2261e8b..4b994b74 100644 --- a/src/Lumina.Excel/GeneratedSheets/BuddySkill.cs +++ b/src/Lumina.Excel/GeneratedSheets/BuddySkill.cs @@ -7,22 +7,18 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "BuddySkill", columnHash: 0xe3220ddc )] - public class BuddySkill : IExcelRow + public class BuddySkill : ExcelRow { - public byte BuddyLevel; - public bool IsActive; - public ushort Defender; - public ushort Attacker; - public ushort Healer; + public byte BuddyLevel { get; set; } + public bool IsActive { get; set; } + public ushort Defender { get; set; } + public ushort Attacker { get; set; } + public ushort Healer { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); BuddyLevel = parser.ReadColumn< byte >( 0 ); IsActive = parser.ReadColumn< bool >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/Cabinet.cs b/src/Lumina.Excel/GeneratedSheets/Cabinet.cs index 0d89fa94..8daa0359 100644 --- a/src/Lumina.Excel/GeneratedSheets/Cabinet.cs +++ b/src/Lumina.Excel/GeneratedSheets/Cabinet.cs @@ -7,24 +7,20 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Cabinet", columnHash: 0x200261d8 )] - public class Cabinet : IExcelRow + public class Cabinet : ExcelRow { - public LazyRow< Item > Item; - public ushort Order; - public LazyRow< CabinetCategory > Category; + public LazyRow< Item > Item { get; set; } + public ushort Order { get; set; } + public LazyRow< CabinetCategory > Category { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Item = new LazyRow< Item >( lumina, parser.ReadColumn< int >( 0 ), language ); + Item = new LazyRow< Item >( gameData, parser.ReadColumn< int >( 0 ), language ); Order = parser.ReadColumn< ushort >( 1 ); - Category = new LazyRow< CabinetCategory >( lumina, parser.ReadColumn< byte >( 2 ), language ); + Category = new LazyRow< CabinetCategory >( gameData, parser.ReadColumn< byte >( 2 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/CabinetCategory.cs b/src/Lumina.Excel/GeneratedSheets/CabinetCategory.cs index 74c64e97..64d8df06 100644 --- a/src/Lumina.Excel/GeneratedSheets/CabinetCategory.cs +++ b/src/Lumina.Excel/GeneratedSheets/CabinetCategory.cs @@ -7,24 +7,20 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "CabinetCategory", columnHash: 0xc6207018 )] - public class CabinetCategory : IExcelRow + public class CabinetCategory : ExcelRow { - public byte MenuOrder; - public int Icon; - public LazyRow< Addon > Category; + public byte MenuOrder { get; set; } + public int Icon { get; set; } + public LazyRow< Addon > Category { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); MenuOrder = parser.ReadColumn< byte >( 0 ); Icon = parser.ReadColumn< int >( 1 ); - Category = new LazyRow< Addon >( lumina, parser.ReadColumn< int >( 2 ), language ); + Category = new LazyRow< Addon >( gameData, parser.ReadColumn< int >( 2 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/Calendar.cs b/src/Lumina.Excel/GeneratedSheets/Calendar.cs index 9f044cb9..2c02e8a3 100644 --- a/src/Lumina.Excel/GeneratedSheets/Calendar.cs +++ b/src/Lumina.Excel/GeneratedSheets/Calendar.cs @@ -7,19 +7,15 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Calendar", columnHash: 0x005cfabb )] - public class Calendar : IExcelRow + public class Calendar : ExcelRow { - public byte[] Month; - public byte[] Day; + public byte[] Month { get; set; } + public byte[] Day { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Month = new byte[ 32 ]; for( var i = 0; i < 32; i++ ) diff --git a/src/Lumina.Excel/GeneratedSheets/Carry.cs b/src/Lumina.Excel/GeneratedSheets/Carry.cs index 1c2a519e..3b1f0b2e 100644 --- a/src/Lumina.Excel/GeneratedSheets/Carry.cs +++ b/src/Lumina.Excel/GeneratedSheets/Carry.cs @@ -7,21 +7,17 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Carry", columnHash: 0x31e1f9e6 )] - public class Carry : IExcelRow + public class Carry : ExcelRow { - public ulong Model; - public byte Timeline; - public byte Unknown2; - public byte Unknown3; + public ulong Model { get; set; } + public byte Timeline { get; set; } + public byte Unknown2 { get; set; } + public byte Unknown3 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Model = parser.ReadColumn< ulong >( 0 ); Timeline = parser.ReadColumn< byte >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/Channeling.cs b/src/Lumina.Excel/GeneratedSheets/Channeling.cs index da7b5fdf..45f28d4d 100644 --- a/src/Lumina.Excel/GeneratedSheets/Channeling.cs +++ b/src/Lumina.Excel/GeneratedSheets/Channeling.cs @@ -7,21 +7,17 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Channeling", columnHash: 0x8c3707e3 )] - public class Channeling : IExcelRow + public class Channeling : ExcelRow { - public SeString File; - public byte WidthScale; - public bool AddedIn53; - public bool Unknown3; + public SeString File { get; set; } + public byte WidthScale { get; set; } + public bool AddedIn53 { get; set; } + public bool Unknown3 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); File = parser.ReadColumn< SeString >( 0 ); WidthScale = parser.ReadColumn< byte >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/CharaMakeClassEquip.cs b/src/Lumina.Excel/GeneratedSheets/CharaMakeClassEquip.cs index 78609da5..b1549ab4 100644 --- a/src/Lumina.Excel/GeneratedSheets/CharaMakeClassEquip.cs +++ b/src/Lumina.Excel/GeneratedSheets/CharaMakeClassEquip.cs @@ -7,25 +7,21 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "CharaMakeClassEquip", columnHash: 0x41dafacb )] - public class CharaMakeClassEquip : IExcelRow + public class CharaMakeClassEquip : ExcelRow { - public ulong Helmet; - public ulong Top; - public ulong Glove; - public ulong Down; - public ulong Shoes; - public ulong Weapon; - public ulong SubWeapon; - public LazyRow< ClassJob > Class; + public ulong Helmet { get; set; } + public ulong Top { get; set; } + public ulong Glove { get; set; } + public ulong Down { get; set; } + public ulong Shoes { get; set; } + public ulong Weapon { get; set; } + public ulong SubWeapon { get; set; } + public LazyRow< ClassJob > Class { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Helmet = parser.ReadColumn< ulong >( 0 ); Top = parser.ReadColumn< ulong >( 1 ); @@ -34,7 +30,7 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) Shoes = parser.ReadColumn< ulong >( 4 ); Weapon = parser.ReadColumn< ulong >( 5 ); SubWeapon = parser.ReadColumn< ulong >( 6 ); - Class = new LazyRow< ClassJob >( lumina, parser.ReadColumn< int >( 7 ), language ); + Class = new LazyRow< ClassJob >( gameData, parser.ReadColumn< int >( 7 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/CharaMakeCustomize.cs b/src/Lumina.Excel/GeneratedSheets/CharaMakeCustomize.cs index 9c86abc1..5b8d2c2e 100644 --- a/src/Lumina.Excel/GeneratedSheets/CharaMakeCustomize.cs +++ b/src/Lumina.Excel/GeneratedSheets/CharaMakeCustomize.cs @@ -7,30 +7,26 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "CharaMakeCustomize", columnHash: 0x2ba6bf0f )] - public class CharaMakeCustomize : IExcelRow + public class CharaMakeCustomize : ExcelRow { - public byte FeatureID; - public uint Icon; - public ushort Data; - public bool IsPurchasable; - public LazyRow< Lobby > Hint; - public LazyRow< Item > HintItem; + public byte FeatureID { get; set; } + public uint Icon { get; set; } + public ushort Data { get; set; } + public bool IsPurchasable { get; set; } + public LazyRow< Lobby > Hint { get; set; } + public LazyRow< Item > HintItem { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); FeatureID = parser.ReadColumn< byte >( 0 ); Icon = parser.ReadColumn< uint >( 1 ); Data = parser.ReadColumn< ushort >( 2 ); IsPurchasable = parser.ReadColumn< bool >( 3 ); - Hint = new LazyRow< Lobby >( lumina, parser.ReadColumn< uint >( 4 ), language ); - HintItem = new LazyRow< Item >( lumina, parser.ReadColumn< uint >( 5 ), language ); + Hint = new LazyRow< Lobby >( gameData, parser.ReadColumn< uint >( 4 ), language ); + HintItem = new LazyRow< Item >( gameData, parser.ReadColumn< uint >( 5 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/CharaMakeName.cs b/src/Lumina.Excel/GeneratedSheets/CharaMakeName.cs index 2782d847..ddd738ea 100644 --- a/src/Lumina.Excel/GeneratedSheets/CharaMakeName.cs +++ b/src/Lumina.Excel/GeneratedSheets/CharaMakeName.cs @@ -7,61 +7,57 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "CharaMakeName", columnHash: 0x8230a5a1 )] - public class CharaMakeName : IExcelRow + public class CharaMakeName : ExcelRow { - public SeString HyurMidlanderMale; - public SeString HyurMidlanderFemale; - public SeString HyurMidlanderLastName; - public SeString HyurHighlanderMale; - public SeString HyurHighlanderFemale; - public SeString HyurHighlanderLastName; - public SeString ElezenMale; - public SeString ElezenFemale; - public SeString ElezenWildwoodLastName; - public SeString ElezenDuskwightLastName; - public SeString MiqoteSunMale; - public SeString MiqoteSunFemale; - public SeString MiqoteSunMaleLastName; - public SeString MiqoteSunFemaleLastName; - public SeString MiqoteMoonMale; - public SeString MiqoteMoonFemale; - public SeString MiqoteMoonLastname; - public SeString LalafellPlainsfolkFirstNameStart; - public SeString LalafellPlainsfolkLastNameStart; - public SeString LalafellPlainsfolkEndOfNames; - public SeString LalafellDunesfolkMale; - public SeString LalafellDunesfolkMaleLastName; - public SeString LalafellDunesfolkFemale; - public SeString LalafellDunesfolkFemaleLastName; - public SeString RoegadynSeaWolfMale; - public SeString RoegadynSeaWolfMaleLastName; - public SeString RoegadynSeaWolfFemale; - public SeString RoegadynSeaWolfFemaleLastName; - public SeString RoegadynHellsguardFirstName; - public SeString RoegadynHellsguardMaleLastName; - public SeString RoegadynHellsguardFemaleLastName; - public SeString AuRaRaenMale; - public SeString AuRaRaenFemale; - public SeString AuRaRaenLastName; - public SeString AuRaXaelaMale; - public SeString AuRaXaelaFemale; - public SeString AuRaXaelaLastName; - public SeString HrothgarHellionsFirstName; - public SeString HrothgarHellionsLastName; - public SeString HrothgarLostFirstName; - public SeString HrothgarLostLastName; - public SeString VieraFirstName; - public SeString VieraRavaLastName; - public SeString VieraVeenaLastName; + public SeString HyurMidlanderMale { get; set; } + public SeString HyurMidlanderFemale { get; set; } + public SeString HyurMidlanderLastName { get; set; } + public SeString HyurHighlanderMale { get; set; } + public SeString HyurHighlanderFemale { get; set; } + public SeString HyurHighlanderLastName { get; set; } + public SeString ElezenMale { get; set; } + public SeString ElezenFemale { get; set; } + public SeString ElezenWildwoodLastName { get; set; } + public SeString ElezenDuskwightLastName { get; set; } + public SeString MiqoteSunMale { get; set; } + public SeString MiqoteSunFemale { get; set; } + public SeString MiqoteSunMaleLastName { get; set; } + public SeString MiqoteSunFemaleLastName { get; set; } + public SeString MiqoteMoonMale { get; set; } + public SeString MiqoteMoonFemale { get; set; } + public SeString MiqoteMoonLastname { get; set; } + public SeString LalafellPlainsfolkFirstNameStart { get; set; } + public SeString LalafellPlainsfolkLastNameStart { get; set; } + public SeString LalafellPlainsfolkEndOfNames { get; set; } + public SeString LalafellDunesfolkMale { get; set; } + public SeString LalafellDunesfolkMaleLastName { get; set; } + public SeString LalafellDunesfolkFemale { get; set; } + public SeString LalafellDunesfolkFemaleLastName { get; set; } + public SeString RoegadynSeaWolfMale { get; set; } + public SeString RoegadynSeaWolfMaleLastName { get; set; } + public SeString RoegadynSeaWolfFemale { get; set; } + public SeString RoegadynSeaWolfFemaleLastName { get; set; } + public SeString RoegadynHellsguardFirstName { get; set; } + public SeString RoegadynHellsguardMaleLastName { get; set; } + public SeString RoegadynHellsguardFemaleLastName { get; set; } + public SeString AuRaRaenMale { get; set; } + public SeString AuRaRaenFemale { get; set; } + public SeString AuRaRaenLastName { get; set; } + public SeString AuRaXaelaMale { get; set; } + public SeString AuRaXaelaFemale { get; set; } + public SeString AuRaXaelaLastName { get; set; } + public SeString HrothgarHellionsFirstName { get; set; } + public SeString HrothgarHellionsLastName { get; set; } + public SeString HrothgarLostFirstName { get; set; } + public SeString HrothgarLostLastName { get; set; } + public SeString VieraFirstName { get; set; } + public SeString VieraRavaLastName { get; set; } + public SeString VieraVeenaLastName { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); HyurMidlanderMale = parser.ReadColumn< SeString >( 0 ); HyurMidlanderFemale = parser.ReadColumn< SeString >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/CharaMakeType.cs b/src/Lumina.Excel/GeneratedSheets/CharaMakeType.cs index d0167e3f..597684bd 100644 --- a/src/Lumina.Excel/GeneratedSheets/CharaMakeType.cs +++ b/src/Lumina.Excel/GeneratedSheets/CharaMakeType.cs @@ -7,7 +7,7 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "CharaMakeType", columnHash: 0x80d7db6d )] - public class CharaMakeType : IExcelRow + public class CharaMakeType : ExcelRow { public struct UnkStruct199Struct { @@ -28,3065 +28,3061 @@ public struct UnkStruct3347Struct public ulong SubWeapon; } - public LazyRow< Race > Race; - public LazyRow< Tribe > Tribe; - public sbyte Gender; - public uint[] Menu; - public byte[] InitVal; - public byte[] SubMenuType; - public byte[] SubMenuNum; - public byte[] LookAt; - public uint[] SubMenuMask; - public uint[] Customize; - public UnkStruct199Struct[] UnkStruct199; - public uint Unknown299; - public uint Unknown300; - public uint Unknown301; - public uint Unknown302; - public uint Unknown303; - public uint Unknown304; - public uint Unknown305; - public uint Unknown306; - public uint Unknown307; - public uint Unknown308; - public uint Unknown309; - public uint Unknown310; - public uint Unknown311; - public uint Unknown312; - public uint Unknown313; - public uint Unknown314; - public uint Unknown315; - public uint Unknown316; - public uint Unknown317; - public uint Unknown318; - public uint Unknown319; - public uint Unknown320; - public uint Unknown321; - public uint Unknown322; - public uint Unknown323; - public uint Unknown324; - public uint Unknown325; - public uint Unknown326; - public uint Unknown327; - public uint Unknown328; - public uint Unknown329; - public uint Unknown330; - public uint Unknown331; - public uint Unknown332; - public uint Unknown333; - public uint Unknown334; - public uint Unknown335; - public uint Unknown336; - public uint Unknown337; - public uint Unknown338; - public uint Unknown339; - public uint Unknown340; - public uint Unknown341; - public uint Unknown342; - public uint Unknown343; - public uint Unknown344; - public uint Unknown345; - public uint Unknown346; - public uint Unknown347; - public uint Unknown348; - public uint Unknown349; - public uint Unknown350; - public uint Unknown351; - public uint Unknown352; - public uint Unknown353; - public uint Unknown354; - public uint Unknown355; - public uint Unknown356; - public uint Unknown357; - public uint Unknown358; - public uint Unknown359; - public uint Unknown360; - public uint Unknown361; - public uint Unknown362; - public uint Unknown363; - public uint Unknown364; - public uint Unknown365; - public uint Unknown366; - public uint Unknown367; - public uint Unknown368; - public uint Unknown369; - public uint Unknown370; - public uint Unknown371; - public uint Unknown372; - public uint Unknown373; - public uint Unknown374; - public uint Unknown375; - public uint Unknown376; - public uint Unknown377; - public uint Unknown378; - public uint Unknown379; - public uint Unknown380; - public uint Unknown381; - public uint Unknown382; - public uint Unknown383; - public uint Unknown384; - public uint Unknown385; - public uint Unknown386; - public uint Unknown387; - public uint Unknown388; - public uint Unknown389; - public uint Unknown390; - public uint Unknown391; - public uint Unknown392; - public uint Unknown393; - public uint Unknown394; - public uint Unknown395; - public uint Unknown396; - public uint Unknown397; - public uint Unknown398; - public uint Unknown399; - public uint Unknown400; - public uint Unknown401; - public uint Unknown402; - public uint Unknown403; - public uint Unknown404; - public uint Unknown405; - public uint Unknown406; - public uint Unknown407; - public uint Unknown408; - public uint Unknown409; - public uint Unknown410; - public uint Unknown411; - public uint Unknown412; - public uint Unknown413; - public uint Unknown414; - public uint Unknown415; - public uint Unknown416; - public uint Unknown417; - public uint Unknown418; - public uint Unknown419; - public uint Unknown420; - public uint Unknown421; - public uint Unknown422; - public uint Unknown423; - public uint Unknown424; - public uint Unknown425; - public uint Unknown426; - public uint Unknown427; - public uint Unknown428; - public uint Unknown429; - public uint Unknown430; - public uint Unknown431; - public uint Unknown432; - public uint Unknown433; - public uint Unknown434; - public uint Unknown435; - public uint Unknown436; - public uint Unknown437; - public uint Unknown438; - public uint Unknown439; - public uint Unknown440; - public uint Unknown441; - public uint Unknown442; - public uint Unknown443; - public uint Unknown444; - public uint Unknown445; - public uint Unknown446; - public uint Unknown447; - public uint Unknown448; - public uint Unknown449; - public uint Unknown450; - public uint Unknown451; - public uint Unknown452; - public uint Unknown453; - public uint Unknown454; - public uint Unknown455; - public uint Unknown456; - public uint Unknown457; - public uint Unknown458; - public uint Unknown459; - public uint Unknown460; - public uint Unknown461; - public uint Unknown462; - public uint Unknown463; - public uint Unknown464; - public uint Unknown465; - public uint Unknown466; - public uint Unknown467; - public uint Unknown468; - public uint Unknown469; - public uint Unknown470; - public uint Unknown471; - public uint Unknown472; - public uint Unknown473; - public uint Unknown474; - public uint Unknown475; - public uint Unknown476; - public uint Unknown477; - public uint Unknown478; - public uint Unknown479; - public uint Unknown480; - public uint Unknown481; - public uint Unknown482; - public uint Unknown483; - public uint Unknown484; - public uint Unknown485; - public uint Unknown486; - public uint Unknown487; - public uint Unknown488; - public uint Unknown489; - public uint Unknown490; - public uint Unknown491; - public uint Unknown492; - public uint Unknown493; - public uint Unknown494; - public uint Unknown495; - public uint Unknown496; - public uint Unknown497; - public uint Unknown498; - public uint Unknown499; - public uint Unknown500; - public uint Unknown501; - public uint Unknown502; - public uint Unknown503; - public uint Unknown504; - public uint Unknown505; - public uint Unknown506; - public uint Unknown507; - public uint Unknown508; - public uint Unknown509; - public uint Unknown510; - public uint Unknown511; - public uint Unknown512; - public uint Unknown513; - public uint Unknown514; - public uint Unknown515; - public uint Unknown516; - public uint Unknown517; - public uint Unknown518; - public uint Unknown519; - public uint Unknown520; - public uint Unknown521; - public uint Unknown522; - public uint Unknown523; - public uint Unknown524; - public uint Unknown525; - public uint Unknown526; - public uint Unknown527; - public uint Unknown528; - public uint Unknown529; - public uint Unknown530; - public uint Unknown531; - public uint Unknown532; - public uint Unknown533; - public uint Unknown534; - public uint Unknown535; - public uint Unknown536; - public uint Unknown537; - public uint Unknown538; - public uint Unknown539; - public uint Unknown540; - public uint Unknown541; - public uint Unknown542; - public uint Unknown543; - public uint Unknown544; - public uint Unknown545; - public uint Unknown546; - public uint Unknown547; - public uint Unknown548; - public uint Unknown549; - public uint Unknown550; - public uint Unknown551; - public uint Unknown552; - public uint Unknown553; - public uint Unknown554; - public uint Unknown555; - public uint Unknown556; - public uint Unknown557; - public uint Unknown558; - public uint Unknown559; - public uint Unknown560; - public uint Unknown561; - public uint Unknown562; - public uint Unknown563; - public uint Unknown564; - public uint Unknown565; - public uint Unknown566; - public uint Unknown567; - public uint Unknown568; - public uint Unknown569; - public uint Unknown570; - public uint Unknown571; - public uint Unknown572; - public uint Unknown573; - public uint Unknown574; - public uint Unknown575; - public uint Unknown576; - public uint Unknown577; - public uint Unknown578; - public uint Unknown579; - public uint Unknown580; - public uint Unknown581; - public uint Unknown582; - public uint Unknown583; - public uint Unknown584; - public uint Unknown585; - public uint Unknown586; - public uint Unknown587; - public uint Unknown588; - public uint Unknown589; - public uint Unknown590; - public uint Unknown591; - public uint Unknown592; - public uint Unknown593; - public uint Unknown594; - public uint Unknown595; - public uint Unknown596; - public uint Unknown597; - public uint Unknown598; - public uint Unknown599; - public uint Unknown600; - public uint Unknown601; - public uint Unknown602; - public uint Unknown603; - public uint Unknown604; - public uint Unknown605; - public uint Unknown606; - public uint Unknown607; - public uint Unknown608; - public uint Unknown609; - public uint Unknown610; - public uint Unknown611; - public uint Unknown612; - public uint Unknown613; - public uint Unknown614; - public uint Unknown615; - public uint Unknown616; - public uint Unknown617; - public uint Unknown618; - public uint Unknown619; - public uint Unknown620; - public uint Unknown621; - public uint Unknown622; - public uint Unknown623; - public uint Unknown624; - public uint Unknown625; - public uint Unknown626; - public uint Unknown627; - public uint Unknown628; - public uint Unknown629; - public uint Unknown630; - public uint Unknown631; - public uint Unknown632; - public uint Unknown633; - public uint Unknown634; - public uint Unknown635; - public uint Unknown636; - public uint Unknown637; - public uint Unknown638; - public uint Unknown639; - public uint Unknown640; - public uint Unknown641; - public uint Unknown642; - public uint Unknown643; - public uint Unknown644; - public uint Unknown645; - public uint Unknown646; - public uint Unknown647; - public uint Unknown648; - public uint Unknown649; - public uint Unknown650; - public uint Unknown651; - public uint Unknown652; - public uint Unknown653; - public uint Unknown654; - public uint Unknown655; - public uint Unknown656; - public uint Unknown657; - public uint Unknown658; - public uint Unknown659; - public uint Unknown660; - public uint Unknown661; - public uint Unknown662; - public uint Unknown663; - public uint Unknown664; - public uint Unknown665; - public uint Unknown666; - public uint Unknown667; - public uint Unknown668; - public uint Unknown669; - public uint Unknown670; - public uint Unknown671; - public uint Unknown672; - public uint Unknown673; - public uint Unknown674; - public uint Unknown675; - public uint Unknown676; - public uint Unknown677; - public uint Unknown678; - public uint Unknown679; - public uint Unknown680; - public uint Unknown681; - public uint Unknown682; - public uint Unknown683; - public uint Unknown684; - public uint Unknown685; - public uint Unknown686; - public uint Unknown687; - public uint Unknown688; - public uint Unknown689; - public uint Unknown690; - public uint Unknown691; - public uint Unknown692; - public uint Unknown693; - public uint Unknown694; - public uint Unknown695; - public uint Unknown696; - public uint Unknown697; - public uint Unknown698; - public uint Unknown699; - public uint Unknown700; - public uint Unknown701; - public uint Unknown702; - public uint Unknown703; - public uint Unknown704; - public uint Unknown705; - public uint Unknown706; - public uint Unknown707; - public uint Unknown708; - public uint Unknown709; - public uint Unknown710; - public uint Unknown711; - public uint Unknown712; - public uint Unknown713; - public uint Unknown714; - public uint Unknown715; - public uint Unknown716; - public uint Unknown717; - public uint Unknown718; - public uint Unknown719; - public uint Unknown720; - public uint Unknown721; - public uint Unknown722; - public uint Unknown723; - public uint Unknown724; - public uint Unknown725; - public uint Unknown726; - public uint Unknown727; - public uint Unknown728; - public uint Unknown729; - public uint Unknown730; - public uint Unknown731; - public uint Unknown732; - public uint Unknown733; - public uint Unknown734; - public uint Unknown735; - public uint Unknown736; - public uint Unknown737; - public uint Unknown738; - public uint Unknown739; - public uint Unknown740; - public uint Unknown741; - public uint Unknown742; - public uint Unknown743; - public uint Unknown744; - public uint Unknown745; - public uint Unknown746; - public uint Unknown747; - public uint Unknown748; - public uint Unknown749; - public uint Unknown750; - public uint Unknown751; - public uint Unknown752; - public uint Unknown753; - public uint Unknown754; - public uint Unknown755; - public uint Unknown756; - public uint Unknown757; - public uint Unknown758; - public uint Unknown759; - public uint Unknown760; - public uint Unknown761; - public uint Unknown762; - public uint Unknown763; - public uint Unknown764; - public uint Unknown765; - public uint Unknown766; - public uint Unknown767; - public uint Unknown768; - public uint Unknown769; - public uint Unknown770; - public uint Unknown771; - public uint Unknown772; - public uint Unknown773; - public uint Unknown774; - public uint Unknown775; - public uint Unknown776; - public uint Unknown777; - public uint Unknown778; - public uint Unknown779; - public uint Unknown780; - public uint Unknown781; - public uint Unknown782; - public uint Unknown783; - public uint Unknown784; - public uint Unknown785; - public uint Unknown786; - public uint Unknown787; - public uint Unknown788; - public uint Unknown789; - public uint Unknown790; - public uint Unknown791; - public uint Unknown792; - public uint Unknown793; - public uint Unknown794; - public uint Unknown795; - public uint Unknown796; - public uint Unknown797; - public uint Unknown798; - public uint Unknown799; - public uint Unknown800; - public uint Unknown801; - public uint Unknown802; - public uint Unknown803; - public uint Unknown804; - public uint Unknown805; - public uint Unknown806; - public uint Unknown807; - public uint Unknown808; - public uint Unknown809; - public uint Unknown810; - public uint Unknown811; - public uint Unknown812; - public uint Unknown813; - public uint Unknown814; - public uint Unknown815; - public uint Unknown816; - public uint Unknown817; - public uint Unknown818; - public uint Unknown819; - public uint Unknown820; - public uint Unknown821; - public uint Unknown822; - public uint Unknown823; - public uint Unknown824; - public uint Unknown825; - public uint Unknown826; - public uint Unknown827; - public uint Unknown828; - public uint Unknown829; - public uint Unknown830; - public uint Unknown831; - public uint Unknown832; - public uint Unknown833; - public uint Unknown834; - public uint Unknown835; - public uint Unknown836; - public uint Unknown837; - public uint Unknown838; - public uint Unknown839; - public uint Unknown840; - public uint Unknown841; - public uint Unknown842; - public uint Unknown843; - public uint Unknown844; - public uint Unknown845; - public uint Unknown846; - public uint Unknown847; - public uint Unknown848; - public uint Unknown849; - public uint Unknown850; - public uint Unknown851; - public uint Unknown852; - public uint Unknown853; - public uint Unknown854; - public uint Unknown855; - public uint Unknown856; - public uint Unknown857; - public uint Unknown858; - public uint Unknown859; - public uint Unknown860; - public uint Unknown861; - public uint Unknown862; - public uint Unknown863; - public uint Unknown864; - public uint Unknown865; - public uint Unknown866; - public uint Unknown867; - public uint Unknown868; - public uint Unknown869; - public uint Unknown870; - public uint Unknown871; - public uint Unknown872; - public uint Unknown873; - public uint Unknown874; - public uint Unknown875; - public uint Unknown876; - public uint Unknown877; - public uint Unknown878; - public uint Unknown879; - public uint Unknown880; - public uint Unknown881; - public uint Unknown882; - public uint Unknown883; - public uint Unknown884; - public uint Unknown885; - public uint Unknown886; - public uint Unknown887; - public uint Unknown888; - public uint Unknown889; - public uint Unknown890; - public uint Unknown891; - public uint Unknown892; - public uint Unknown893; - public uint Unknown894; - public uint Unknown895; - public uint Unknown896; - public uint Unknown897; - public uint Unknown898; - public uint Unknown899; - public uint Unknown900; - public uint Unknown901; - public uint Unknown902; - public uint Unknown903; - public uint Unknown904; - public uint Unknown905; - public uint Unknown906; - public uint Unknown907; - public uint Unknown908; - public uint Unknown909; - public uint Unknown910; - public uint Unknown911; - public uint Unknown912; - public uint Unknown913; - public uint Unknown914; - public uint Unknown915; - public uint Unknown916; - public uint Unknown917; - public uint Unknown918; - public uint Unknown919; - public uint Unknown920; - public uint Unknown921; - public uint Unknown922; - public uint Unknown923; - public uint Unknown924; - public uint Unknown925; - public uint Unknown926; - public uint Unknown927; - public uint Unknown928; - public uint Unknown929; - public uint Unknown930; - public uint Unknown931; - public uint Unknown932; - public uint Unknown933; - public uint Unknown934; - public uint Unknown935; - public uint Unknown936; - public uint Unknown937; - public uint Unknown938; - public uint Unknown939; - public uint Unknown940; - public uint Unknown941; - public uint Unknown942; - public uint Unknown943; - public uint Unknown944; - public uint Unknown945; - public uint Unknown946; - public uint Unknown947; - public uint Unknown948; - public uint Unknown949; - public uint Unknown950; - public uint Unknown951; - public uint Unknown952; - public uint Unknown953; - public uint Unknown954; - public uint Unknown955; - public uint Unknown956; - public uint Unknown957; - public uint Unknown958; - public uint Unknown959; - public uint Unknown960; - public uint Unknown961; - public uint Unknown962; - public uint Unknown963; - public uint Unknown964; - public uint Unknown965; - public uint Unknown966; - public uint Unknown967; - public uint Unknown968; - public uint Unknown969; - public uint Unknown970; - public uint Unknown971; - public uint Unknown972; - public uint Unknown973; - public uint Unknown974; - public uint Unknown975; - public uint Unknown976; - public uint Unknown977; - public uint Unknown978; - public uint Unknown979; - public uint Unknown980; - public uint Unknown981; - public uint Unknown982; - public uint Unknown983; - public uint Unknown984; - public uint Unknown985; - public uint Unknown986; - public uint Unknown987; - public uint Unknown988; - public uint Unknown989; - public uint Unknown990; - public uint Unknown991; - public uint Unknown992; - public uint Unknown993; - public uint Unknown994; - public uint Unknown995; - public uint Unknown996; - public uint Unknown997; - public uint Unknown998; - public uint Unknown999; - public uint Unknown1000; - public uint Unknown1001; - public uint Unknown1002; - public uint Unknown1003; - public uint Unknown1004; - public uint Unknown1005; - public uint Unknown1006; - public uint Unknown1007; - public uint Unknown1008; - public uint Unknown1009; - public uint Unknown1010; - public uint Unknown1011; - public uint Unknown1012; - public uint Unknown1013; - public uint Unknown1014; - public uint Unknown1015; - public uint Unknown1016; - public uint Unknown1017; - public uint Unknown1018; - public uint Unknown1019; - public uint Unknown1020; - public uint Unknown1021; - public uint Unknown1022; - public uint Unknown1023; - public uint Unknown1024; - public uint Unknown1025; - public uint Unknown1026; - public uint Unknown1027; - public uint Unknown1028; - public uint Unknown1029; - public uint Unknown1030; - public uint Unknown1031; - public uint Unknown1032; - public uint Unknown1033; - public uint Unknown1034; - public uint Unknown1035; - public uint Unknown1036; - public uint Unknown1037; - public uint Unknown1038; - public uint Unknown1039; - public uint Unknown1040; - public uint Unknown1041; - public uint Unknown1042; - public uint Unknown1043; - public uint Unknown1044; - public uint Unknown1045; - public uint Unknown1046; - public uint Unknown1047; - public uint Unknown1048; - public uint Unknown1049; - public uint Unknown1050; - public uint Unknown1051; - public uint Unknown1052; - public uint Unknown1053; - public uint Unknown1054; - public uint Unknown1055; - public uint Unknown1056; - public uint Unknown1057; - public uint Unknown1058; - public uint Unknown1059; - public uint Unknown1060; - public uint Unknown1061; - public uint Unknown1062; - public uint Unknown1063; - public uint Unknown1064; - public uint Unknown1065; - public uint Unknown1066; - public uint Unknown1067; - public uint Unknown1068; - public uint Unknown1069; - public uint Unknown1070; - public uint Unknown1071; - public uint Unknown1072; - public uint Unknown1073; - public uint Unknown1074; - public uint Unknown1075; - public uint Unknown1076; - public uint Unknown1077; - public uint Unknown1078; - public uint Unknown1079; - public uint Unknown1080; - public uint Unknown1081; - public uint Unknown1082; - public uint Unknown1083; - public uint Unknown1084; - public uint Unknown1085; - public uint Unknown1086; - public uint Unknown1087; - public uint Unknown1088; - public uint Unknown1089; - public uint Unknown1090; - public uint Unknown1091; - public uint Unknown1092; - public uint Unknown1093; - public uint Unknown1094; - public uint Unknown1095; - public uint Unknown1096; - public uint Unknown1097; - public uint Unknown1098; - public uint Unknown1099; - public uint Unknown1100; - public uint Unknown1101; - public uint Unknown1102; - public uint Unknown1103; - public uint Unknown1104; - public uint Unknown1105; - public uint Unknown1106; - public uint Unknown1107; - public uint Unknown1108; - public uint Unknown1109; - public uint Unknown1110; - public uint Unknown1111; - public uint Unknown1112; - public uint Unknown1113; - public uint Unknown1114; - public uint Unknown1115; - public uint Unknown1116; - public uint Unknown1117; - public uint Unknown1118; - public uint Unknown1119; - public uint Unknown1120; - public uint Unknown1121; - public uint Unknown1122; - public uint Unknown1123; - public uint Unknown1124; - public uint Unknown1125; - public uint Unknown1126; - public uint Unknown1127; - public uint Unknown1128; - public uint Unknown1129; - public uint Unknown1130; - public uint Unknown1131; - public uint Unknown1132; - public uint Unknown1133; - public uint Unknown1134; - public uint Unknown1135; - public uint Unknown1136; - public uint Unknown1137; - public uint Unknown1138; - public uint Unknown1139; - public uint Unknown1140; - public uint Unknown1141; - public uint Unknown1142; - public uint Unknown1143; - public uint Unknown1144; - public uint Unknown1145; - public uint Unknown1146; - public uint Unknown1147; - public uint Unknown1148; - public uint Unknown1149; - public uint Unknown1150; - public uint Unknown1151; - public uint Unknown1152; - public uint Unknown1153; - public uint Unknown1154; - public uint Unknown1155; - public uint Unknown1156; - public uint Unknown1157; - public uint Unknown1158; - public uint Unknown1159; - public uint Unknown1160; - public uint Unknown1161; - public uint Unknown1162; - public uint Unknown1163; - public uint Unknown1164; - public uint Unknown1165; - public uint Unknown1166; - public uint Unknown1167; - public uint Unknown1168; - public uint Unknown1169; - public uint Unknown1170; - public uint Unknown1171; - public uint Unknown1172; - public uint Unknown1173; - public uint Unknown1174; - public uint Unknown1175; - public uint Unknown1176; - public uint Unknown1177; - public uint Unknown1178; - public uint Unknown1179; - public uint Unknown1180; - public uint Unknown1181; - public uint Unknown1182; - public uint Unknown1183; - public uint Unknown1184; - public uint Unknown1185; - public uint Unknown1186; - public uint Unknown1187; - public uint Unknown1188; - public uint Unknown1189; - public uint Unknown1190; - public uint Unknown1191; - public uint Unknown1192; - public uint Unknown1193; - public uint Unknown1194; - public uint Unknown1195; - public uint Unknown1196; - public uint Unknown1197; - public uint Unknown1198; - public uint Unknown1199; - public uint Unknown1200; - public uint Unknown1201; - public uint Unknown1202; - public uint Unknown1203; - public uint Unknown1204; - public uint Unknown1205; - public uint Unknown1206; - public uint Unknown1207; - public uint Unknown1208; - public uint Unknown1209; - public uint Unknown1210; - public uint Unknown1211; - public uint Unknown1212; - public uint Unknown1213; - public uint Unknown1214; - public uint Unknown1215; - public uint Unknown1216; - public uint Unknown1217; - public uint Unknown1218; - public uint Unknown1219; - public uint Unknown1220; - public uint Unknown1221; - public uint Unknown1222; - public uint Unknown1223; - public uint Unknown1224; - public uint Unknown1225; - public uint Unknown1226; - public uint Unknown1227; - public uint Unknown1228; - public uint Unknown1229; - public uint Unknown1230; - public uint Unknown1231; - public uint Unknown1232; - public uint Unknown1233; - public uint Unknown1234; - public uint Unknown1235; - public uint Unknown1236; - public uint Unknown1237; - public uint Unknown1238; - public uint Unknown1239; - public uint Unknown1240; - public uint Unknown1241; - public uint Unknown1242; - public uint Unknown1243; - public uint Unknown1244; - public uint Unknown1245; - public uint Unknown1246; - public uint Unknown1247; - public uint Unknown1248; - public uint Unknown1249; - public uint Unknown1250; - public uint Unknown1251; - public uint Unknown1252; - public uint Unknown1253; - public uint Unknown1254; - public uint Unknown1255; - public uint Unknown1256; - public uint Unknown1257; - public uint Unknown1258; - public uint Unknown1259; - public uint Unknown1260; - public uint Unknown1261; - public uint Unknown1262; - public uint Unknown1263; - public uint Unknown1264; - public uint Unknown1265; - public uint Unknown1266; - public uint Unknown1267; - public uint Unknown1268; - public uint Unknown1269; - public uint Unknown1270; - public uint Unknown1271; - public uint Unknown1272; - public uint Unknown1273; - public uint Unknown1274; - public uint Unknown1275; - public uint Unknown1276; - public uint Unknown1277; - public uint Unknown1278; - public uint Unknown1279; - public uint Unknown1280; - public uint Unknown1281; - public uint Unknown1282; - public uint Unknown1283; - public uint Unknown1284; - public uint Unknown1285; - public uint Unknown1286; - public uint Unknown1287; - public uint Unknown1288; - public uint Unknown1289; - public uint Unknown1290; - public uint Unknown1291; - public uint Unknown1292; - public uint Unknown1293; - public uint Unknown1294; - public uint Unknown1295; - public uint Unknown1296; - public uint Unknown1297; - public uint Unknown1298; - public uint Unknown1299; - public uint Unknown1300; - public uint Unknown1301; - public uint Unknown1302; - public uint Unknown1303; - public uint Unknown1304; - public uint Unknown1305; - public uint Unknown1306; - public uint Unknown1307; - public uint Unknown1308; - public uint Unknown1309; - public uint Unknown1310; - public uint Unknown1311; - public uint Unknown1312; - public uint Unknown1313; - public uint Unknown1314; - public uint Unknown1315; - public uint Unknown1316; - public uint Unknown1317; - public uint Unknown1318; - public uint Unknown1319; - public uint Unknown1320; - public uint Unknown1321; - public uint Unknown1322; - public uint Unknown1323; - public uint Unknown1324; - public uint Unknown1325; - public uint Unknown1326; - public uint Unknown1327; - public uint Unknown1328; - public uint Unknown1329; - public uint Unknown1330; - public uint Unknown1331; - public uint Unknown1332; - public uint Unknown1333; - public uint Unknown1334; - public uint Unknown1335; - public uint Unknown1336; - public uint Unknown1337; - public uint Unknown1338; - public uint Unknown1339; - public uint Unknown1340; - public uint Unknown1341; - public uint Unknown1342; - public uint Unknown1343; - public uint Unknown1344; - public uint Unknown1345; - public uint Unknown1346; - public uint Unknown1347; - public uint Unknown1348; - public uint Unknown1349; - public uint Unknown1350; - public uint Unknown1351; - public uint Unknown1352; - public uint Unknown1353; - public uint Unknown1354; - public uint Unknown1355; - public uint Unknown1356; - public uint Unknown1357; - public uint Unknown1358; - public uint Unknown1359; - public uint Unknown1360; - public uint Unknown1361; - public uint Unknown1362; - public uint Unknown1363; - public uint Unknown1364; - public uint Unknown1365; - public uint Unknown1366; - public uint Unknown1367; - public uint Unknown1368; - public uint Unknown1369; - public uint Unknown1370; - public uint Unknown1371; - public uint Unknown1372; - public uint Unknown1373; - public uint Unknown1374; - public uint Unknown1375; - public uint Unknown1376; - public uint Unknown1377; - public uint Unknown1378; - public uint Unknown1379; - public uint Unknown1380; - public uint Unknown1381; - public uint Unknown1382; - public uint Unknown1383; - public uint Unknown1384; - public uint Unknown1385; - public uint Unknown1386; - public uint Unknown1387; - public uint Unknown1388; - public uint Unknown1389; - public uint Unknown1390; - public uint Unknown1391; - public uint Unknown1392; - public uint Unknown1393; - public uint Unknown1394; - public uint Unknown1395; - public uint Unknown1396; - public uint Unknown1397; - public uint Unknown1398; - public uint Unknown1399; - public uint Unknown1400; - public uint Unknown1401; - public uint Unknown1402; - public uint Unknown1403; - public uint Unknown1404; - public uint Unknown1405; - public uint Unknown1406; - public uint Unknown1407; - public uint Unknown1408; - public uint Unknown1409; - public uint Unknown1410; - public uint Unknown1411; - public uint Unknown1412; - public uint Unknown1413; - public uint Unknown1414; - public uint Unknown1415; - public uint Unknown1416; - public uint Unknown1417; - public uint Unknown1418; - public uint Unknown1419; - public uint Unknown1420; - public uint Unknown1421; - public uint Unknown1422; - public uint Unknown1423; - public uint Unknown1424; - public uint Unknown1425; - public uint Unknown1426; - public uint Unknown1427; - public uint Unknown1428; - public uint Unknown1429; - public uint Unknown1430; - public uint Unknown1431; - public uint Unknown1432; - public uint Unknown1433; - public uint Unknown1434; - public uint Unknown1435; - public uint Unknown1436; - public uint Unknown1437; - public uint Unknown1438; - public uint Unknown1439; - public uint Unknown1440; - public uint Unknown1441; - public uint Unknown1442; - public uint Unknown1443; - public uint Unknown1444; - public uint Unknown1445; - public uint Unknown1446; - public uint Unknown1447; - public uint Unknown1448; - public uint Unknown1449; - public uint Unknown1450; - public uint Unknown1451; - public uint Unknown1452; - public uint Unknown1453; - public uint Unknown1454; - public uint Unknown1455; - public uint Unknown1456; - public uint Unknown1457; - public uint Unknown1458; - public uint Unknown1459; - public uint Unknown1460; - public uint Unknown1461; - public uint Unknown1462; - public uint Unknown1463; - public uint Unknown1464; - public uint Unknown1465; - public uint Unknown1466; - public uint Unknown1467; - public uint Unknown1468; - public uint Unknown1469; - public uint Unknown1470; - public uint Unknown1471; - public uint Unknown1472; - public uint Unknown1473; - public uint Unknown1474; - public uint Unknown1475; - public uint Unknown1476; - public uint Unknown1477; - public uint Unknown1478; - public uint Unknown1479; - public uint Unknown1480; - public uint Unknown1481; - public uint Unknown1482; - public uint Unknown1483; - public uint Unknown1484; - public uint Unknown1485; - public uint Unknown1486; - public uint Unknown1487; - public uint Unknown1488; - public uint Unknown1489; - public uint Unknown1490; - public uint Unknown1491; - public uint Unknown1492; - public uint Unknown1493; - public uint Unknown1494; - public uint Unknown1495; - public uint Unknown1496; - public uint Unknown1497; - public uint Unknown1498; - public uint Unknown1499; - public uint Unknown1500; - public uint Unknown1501; - public uint Unknown1502; - public uint Unknown1503; - public uint Unknown1504; - public uint Unknown1505; - public uint Unknown1506; - public uint Unknown1507; - public uint Unknown1508; - public uint Unknown1509; - public uint Unknown1510; - public uint Unknown1511; - public uint Unknown1512; - public uint Unknown1513; - public uint Unknown1514; - public uint Unknown1515; - public uint Unknown1516; - public uint Unknown1517; - public uint Unknown1518; - public uint Unknown1519; - public uint Unknown1520; - public uint Unknown1521; - public uint Unknown1522; - public uint Unknown1523; - public uint Unknown1524; - public uint Unknown1525; - public uint Unknown1526; - public uint Unknown1527; - public uint Unknown1528; - public uint Unknown1529; - public uint Unknown1530; - public uint Unknown1531; - public uint Unknown1532; - public uint Unknown1533; - public uint Unknown1534; - public uint Unknown1535; - public uint Unknown1536; - public uint Unknown1537; - public uint Unknown1538; - public uint Unknown1539; - public uint Unknown1540; - public uint Unknown1541; - public uint Unknown1542; - public uint Unknown1543; - public uint Unknown1544; - public uint Unknown1545; - public uint Unknown1546; - public uint Unknown1547; - public uint Unknown1548; - public uint Unknown1549; - public uint Unknown1550; - public uint Unknown1551; - public uint Unknown1552; - public uint Unknown1553; - public uint Unknown1554; - public uint Unknown1555; - public uint Unknown1556; - public uint Unknown1557; - public uint Unknown1558; - public uint Unknown1559; - public uint Unknown1560; - public uint Unknown1561; - public uint Unknown1562; - public uint Unknown1563; - public uint Unknown1564; - public uint Unknown1565; - public uint Unknown1566; - public uint Unknown1567; - public uint Unknown1568; - public uint Unknown1569; - public uint Unknown1570; - public uint Unknown1571; - public uint Unknown1572; - public uint Unknown1573; - public uint Unknown1574; - public uint Unknown1575; - public uint Unknown1576; - public uint Unknown1577; - public uint Unknown1578; - public uint Unknown1579; - public uint Unknown1580; - public uint Unknown1581; - public uint Unknown1582; - public uint Unknown1583; - public uint Unknown1584; - public uint Unknown1585; - public uint Unknown1586; - public uint Unknown1587; - public uint Unknown1588; - public uint Unknown1589; - public uint Unknown1590; - public uint Unknown1591; - public uint Unknown1592; - public uint Unknown1593; - public uint Unknown1594; - public uint Unknown1595; - public uint Unknown1596; - public uint Unknown1597; - public uint Unknown1598; - public uint Unknown1599; - public uint Unknown1600; - public uint Unknown1601; - public uint Unknown1602; - public uint Unknown1603; - public uint Unknown1604; - public uint Unknown1605; - public uint Unknown1606; - public uint Unknown1607; - public uint Unknown1608; - public uint Unknown1609; - public uint Unknown1610; - public uint Unknown1611; - public uint Unknown1612; - public uint Unknown1613; - public uint Unknown1614; - public uint Unknown1615; - public uint Unknown1616; - public uint Unknown1617; - public uint Unknown1618; - public uint Unknown1619; - public uint Unknown1620; - public uint Unknown1621; - public uint Unknown1622; - public uint Unknown1623; - public uint Unknown1624; - public uint Unknown1625; - public uint Unknown1626; - public uint Unknown1627; - public uint Unknown1628; - public uint Unknown1629; - public uint Unknown1630; - public uint Unknown1631; - public uint Unknown1632; - public uint Unknown1633; - public uint Unknown1634; - public uint Unknown1635; - public uint Unknown1636; - public uint Unknown1637; - public uint Unknown1638; - public uint Unknown1639; - public uint Unknown1640; - public uint Unknown1641; - public uint Unknown1642; - public uint Unknown1643; - public uint Unknown1644; - public uint Unknown1645; - public uint Unknown1646; - public uint Unknown1647; - public uint Unknown1648; - public uint Unknown1649; - public uint Unknown1650; - public uint Unknown1651; - public uint Unknown1652; - public uint Unknown1653; - public uint Unknown1654; - public uint Unknown1655; - public uint Unknown1656; - public uint Unknown1657; - public uint Unknown1658; - public uint Unknown1659; - public uint Unknown1660; - public uint Unknown1661; - public uint Unknown1662; - public uint Unknown1663; - public uint Unknown1664; - public uint Unknown1665; - public uint Unknown1666; - public uint Unknown1667; - public uint Unknown1668; - public uint Unknown1669; - public uint Unknown1670; - public uint Unknown1671; - public uint Unknown1672; - public uint Unknown1673; - public uint Unknown1674; - public uint Unknown1675; - public uint Unknown1676; - public uint Unknown1677; - public uint Unknown1678; - public uint Unknown1679; - public uint Unknown1680; - public uint Unknown1681; - public uint Unknown1682; - public uint Unknown1683; - public uint Unknown1684; - public uint Unknown1685; - public uint Unknown1686; - public uint Unknown1687; - public uint Unknown1688; - public uint Unknown1689; - public uint Unknown1690; - public uint Unknown1691; - public uint Unknown1692; - public uint Unknown1693; - public uint Unknown1694; - public uint Unknown1695; - public uint Unknown1696; - public uint Unknown1697; - public uint Unknown1698; - public uint Unknown1699; - public uint Unknown1700; - public uint Unknown1701; - public uint Unknown1702; - public uint Unknown1703; - public uint Unknown1704; - public uint Unknown1705; - public uint Unknown1706; - public uint Unknown1707; - public uint Unknown1708; - public uint Unknown1709; - public uint Unknown1710; - public uint Unknown1711; - public uint Unknown1712; - public uint Unknown1713; - public uint Unknown1714; - public uint Unknown1715; - public uint Unknown1716; - public uint Unknown1717; - public uint Unknown1718; - public uint Unknown1719; - public uint Unknown1720; - public uint Unknown1721; - public uint Unknown1722; - public uint Unknown1723; - public uint Unknown1724; - public uint Unknown1725; - public uint Unknown1726; - public uint Unknown1727; - public uint Unknown1728; - public uint Unknown1729; - public uint Unknown1730; - public uint Unknown1731; - public uint Unknown1732; - public uint Unknown1733; - public uint Unknown1734; - public uint Unknown1735; - public uint Unknown1736; - public uint Unknown1737; - public uint Unknown1738; - public uint Unknown1739; - public uint Unknown1740; - public uint Unknown1741; - public uint Unknown1742; - public uint Unknown1743; - public uint Unknown1744; - public uint Unknown1745; - public uint Unknown1746; - public uint Unknown1747; - public uint Unknown1748; - public uint Unknown1749; - public uint Unknown1750; - public uint Unknown1751; - public uint Unknown1752; - public uint Unknown1753; - public uint Unknown1754; - public uint Unknown1755; - public uint Unknown1756; - public uint Unknown1757; - public uint Unknown1758; - public uint Unknown1759; - public uint Unknown1760; - public uint Unknown1761; - public uint Unknown1762; - public uint Unknown1763; - public uint Unknown1764; - public uint Unknown1765; - public uint Unknown1766; - public uint Unknown1767; - public uint Unknown1768; - public uint Unknown1769; - public uint Unknown1770; - public uint Unknown1771; - public uint Unknown1772; - public uint Unknown1773; - public uint Unknown1774; - public uint Unknown1775; - public uint Unknown1776; - public uint Unknown1777; - public uint Unknown1778; - public uint Unknown1779; - public uint Unknown1780; - public uint Unknown1781; - public uint Unknown1782; - public uint Unknown1783; - public uint Unknown1784; - public uint Unknown1785; - public uint Unknown1786; - public uint Unknown1787; - public uint Unknown1788; - public uint Unknown1789; - public uint Unknown1790; - public uint Unknown1791; - public uint Unknown1792; - public uint Unknown1793; - public uint Unknown1794; - public uint Unknown1795; - public uint Unknown1796; - public uint Unknown1797; - public uint Unknown1798; - public uint Unknown1799; - public uint Unknown1800; - public uint Unknown1801; - public uint Unknown1802; - public uint Unknown1803; - public uint Unknown1804; - public uint Unknown1805; - public uint Unknown1806; - public uint Unknown1807; - public uint Unknown1808; - public uint Unknown1809; - public uint Unknown1810; - public uint Unknown1811; - public uint Unknown1812; - public uint Unknown1813; - public uint Unknown1814; - public uint Unknown1815; - public uint Unknown1816; - public uint Unknown1817; - public uint Unknown1818; - public uint Unknown1819; - public uint Unknown1820; - public uint Unknown1821; - public uint Unknown1822; - public uint Unknown1823; - public uint Unknown1824; - public uint Unknown1825; - public uint Unknown1826; - public uint Unknown1827; - public uint Unknown1828; - public uint Unknown1829; - public uint Unknown1830; - public uint Unknown1831; - public uint Unknown1832; - public uint Unknown1833; - public uint Unknown1834; - public uint Unknown1835; - public uint Unknown1836; - public uint Unknown1837; - public uint Unknown1838; - public uint Unknown1839; - public uint Unknown1840; - public uint Unknown1841; - public uint Unknown1842; - public uint Unknown1843; - public uint Unknown1844; - public uint Unknown1845; - public uint Unknown1846; - public uint Unknown1847; - public uint Unknown1848; - public uint Unknown1849; - public uint Unknown1850; - public uint Unknown1851; - public uint Unknown1852; - public uint Unknown1853; - public uint Unknown1854; - public uint Unknown1855; - public uint Unknown1856; - public uint Unknown1857; - public uint Unknown1858; - public uint Unknown1859; - public uint Unknown1860; - public uint Unknown1861; - public uint Unknown1862; - public uint Unknown1863; - public uint Unknown1864; - public uint Unknown1865; - public uint Unknown1866; - public uint Unknown1867; - public uint Unknown1868; - public uint Unknown1869; - public uint Unknown1870; - public uint Unknown1871; - public uint Unknown1872; - public uint Unknown1873; - public uint Unknown1874; - public uint Unknown1875; - public uint Unknown1876; - public uint Unknown1877; - public uint Unknown1878; - public uint Unknown1879; - public uint Unknown1880; - public uint Unknown1881; - public uint Unknown1882; - public uint Unknown1883; - public uint Unknown1884; - public uint Unknown1885; - public uint Unknown1886; - public uint Unknown1887; - public uint Unknown1888; - public uint Unknown1889; - public uint Unknown1890; - public uint Unknown1891; - public uint Unknown1892; - public uint Unknown1893; - public uint Unknown1894; - public uint Unknown1895; - public uint Unknown1896; - public uint Unknown1897; - public uint Unknown1898; - public uint Unknown1899; - public uint Unknown1900; - public uint Unknown1901; - public uint Unknown1902; - public uint Unknown1903; - public uint Unknown1904; - public uint Unknown1905; - public uint Unknown1906; - public uint Unknown1907; - public uint Unknown1908; - public uint Unknown1909; - public uint Unknown1910; - public uint Unknown1911; - public uint Unknown1912; - public uint Unknown1913; - public uint Unknown1914; - public uint Unknown1915; - public uint Unknown1916; - public uint Unknown1917; - public uint Unknown1918; - public uint Unknown1919; - public uint Unknown1920; - public uint Unknown1921; - public uint Unknown1922; - public uint Unknown1923; - public uint Unknown1924; - public uint Unknown1925; - public uint Unknown1926; - public uint Unknown1927; - public uint Unknown1928; - public uint Unknown1929; - public uint Unknown1930; - public uint Unknown1931; - public uint Unknown1932; - public uint Unknown1933; - public uint Unknown1934; - public uint Unknown1935; - public uint Unknown1936; - public uint Unknown1937; - public uint Unknown1938; - public uint Unknown1939; - public uint Unknown1940; - public uint Unknown1941; - public uint Unknown1942; - public uint Unknown1943; - public uint Unknown1944; - public uint Unknown1945; - public uint Unknown1946; - public uint Unknown1947; - public uint Unknown1948; - public uint Unknown1949; - public uint Unknown1950; - public uint Unknown1951; - public uint Unknown1952; - public uint Unknown1953; - public uint Unknown1954; - public uint Unknown1955; - public uint Unknown1956; - public uint Unknown1957; - public uint Unknown1958; - public uint Unknown1959; - public uint Unknown1960; - public uint Unknown1961; - public uint Unknown1962; - public uint Unknown1963; - public uint Unknown1964; - public uint Unknown1965; - public uint Unknown1966; - public uint Unknown1967; - public uint Unknown1968; - public uint Unknown1969; - public uint Unknown1970; - public uint Unknown1971; - public uint Unknown1972; - public uint Unknown1973; - public uint Unknown1974; - public uint Unknown1975; - public uint Unknown1976; - public uint Unknown1977; - public uint Unknown1978; - public uint Unknown1979; - public uint Unknown1980; - public uint Unknown1981; - public uint Unknown1982; - public uint Unknown1983; - public uint Unknown1984; - public uint Unknown1985; - public uint Unknown1986; - public uint Unknown1987; - public uint Unknown1988; - public uint Unknown1989; - public uint Unknown1990; - public uint Unknown1991; - public uint Unknown1992; - public uint Unknown1993; - public uint Unknown1994; - public uint Unknown1995; - public uint Unknown1996; - public uint Unknown1997; - public uint Unknown1998; - public uint Unknown1999; - public uint Unknown2000; - public uint Unknown2001; - public uint Unknown2002; - public uint Unknown2003; - public uint Unknown2004; - public uint Unknown2005; - public uint Unknown2006; - public uint Unknown2007; - public uint Unknown2008; - public uint Unknown2009; - public uint Unknown2010; - public uint Unknown2011; - public uint Unknown2012; - public uint Unknown2013; - public uint Unknown2014; - public uint Unknown2015; - public uint Unknown2016; - public uint Unknown2017; - public uint Unknown2018; - public uint Unknown2019; - public uint Unknown2020; - public uint Unknown2021; - public uint Unknown2022; - public uint Unknown2023; - public uint Unknown2024; - public uint Unknown2025; - public uint Unknown2026; - public uint Unknown2027; - public uint Unknown2028; - public uint Unknown2029; - public uint Unknown2030; - public uint Unknown2031; - public uint Unknown2032; - public uint Unknown2033; - public uint Unknown2034; - public uint Unknown2035; - public uint Unknown2036; - public uint Unknown2037; - public uint Unknown2038; - public uint Unknown2039; - public uint Unknown2040; - public uint Unknown2041; - public uint Unknown2042; - public uint Unknown2043; - public uint Unknown2044; - public uint Unknown2045; - public uint Unknown2046; - public uint Unknown2047; - public uint Unknown2048; - public uint Unknown2049; - public uint Unknown2050; - public uint Unknown2051; - public uint Unknown2052; - public uint Unknown2053; - public uint Unknown2054; - public uint Unknown2055; - public uint Unknown2056; - public uint Unknown2057; - public uint Unknown2058; - public uint Unknown2059; - public uint Unknown2060; - public uint Unknown2061; - public uint Unknown2062; - public uint Unknown2063; - public uint Unknown2064; - public uint Unknown2065; - public uint Unknown2066; - public uint Unknown2067; - public uint Unknown2068; - public uint Unknown2069; - public uint Unknown2070; - public uint Unknown2071; - public uint Unknown2072; - public uint Unknown2073; - public uint Unknown2074; - public uint Unknown2075; - public uint Unknown2076; - public uint Unknown2077; - public uint Unknown2078; - public uint Unknown2079; - public uint Unknown2080; - public uint Unknown2081; - public uint Unknown2082; - public uint Unknown2083; - public uint Unknown2084; - public uint Unknown2085; - public uint Unknown2086; - public uint Unknown2087; - public uint Unknown2088; - public uint Unknown2089; - public uint Unknown2090; - public uint Unknown2091; - public uint Unknown2092; - public uint Unknown2093; - public uint Unknown2094; - public uint Unknown2095; - public uint Unknown2096; - public uint Unknown2097; - public uint Unknown2098; - public uint Unknown2099; - public uint Unknown2100; - public uint Unknown2101; - public uint Unknown2102; - public uint Unknown2103; - public uint Unknown2104; - public uint Unknown2105; - public uint Unknown2106; - public uint Unknown2107; - public uint Unknown2108; - public uint Unknown2109; - public uint Unknown2110; - public uint Unknown2111; - public uint Unknown2112; - public uint Unknown2113; - public uint Unknown2114; - public uint Unknown2115; - public uint Unknown2116; - public uint Unknown2117; - public uint Unknown2118; - public uint Unknown2119; - public uint Unknown2120; - public uint Unknown2121; - public uint Unknown2122; - public uint Unknown2123; - public uint Unknown2124; - public uint Unknown2125; - public uint Unknown2126; - public uint Unknown2127; - public uint Unknown2128; - public uint Unknown2129; - public uint Unknown2130; - public uint Unknown2131; - public uint Unknown2132; - public uint Unknown2133; - public uint Unknown2134; - public uint Unknown2135; - public uint Unknown2136; - public uint Unknown2137; - public uint Unknown2138; - public uint Unknown2139; - public uint Unknown2140; - public uint Unknown2141; - public uint Unknown2142; - public uint Unknown2143; - public uint Unknown2144; - public uint Unknown2145; - public uint Unknown2146; - public uint Unknown2147; - public uint Unknown2148; - public uint Unknown2149; - public uint Unknown2150; - public uint Unknown2151; - public uint Unknown2152; - public uint Unknown2153; - public uint Unknown2154; - public uint Unknown2155; - public uint Unknown2156; - public uint Unknown2157; - public uint Unknown2158; - public uint Unknown2159; - public uint Unknown2160; - public uint Unknown2161; - public uint Unknown2162; - public uint Unknown2163; - public uint Unknown2164; - public uint Unknown2165; - public uint Unknown2166; - public uint Unknown2167; - public uint Unknown2168; - public uint Unknown2169; - public uint Unknown2170; - public uint Unknown2171; - public uint Unknown2172; - public uint Unknown2173; - public uint Unknown2174; - public uint Unknown2175; - public uint Unknown2176; - public uint Unknown2177; - public uint Unknown2178; - public uint Unknown2179; - public uint Unknown2180; - public uint Unknown2181; - public uint Unknown2182; - public uint Unknown2183; - public uint Unknown2184; - public uint Unknown2185; - public uint Unknown2186; - public uint Unknown2187; - public uint Unknown2188; - public uint Unknown2189; - public uint Unknown2190; - public uint Unknown2191; - public uint Unknown2192; - public uint Unknown2193; - public uint Unknown2194; - public uint Unknown2195; - public uint Unknown2196; - public uint Unknown2197; - public uint Unknown2198; - public uint Unknown2199; - public uint Unknown2200; - public uint Unknown2201; - public uint Unknown2202; - public uint Unknown2203; - public uint Unknown2204; - public uint Unknown2205; - public uint Unknown2206; - public uint Unknown2207; - public uint Unknown2208; - public uint Unknown2209; - public uint Unknown2210; - public uint Unknown2211; - public uint Unknown2212; - public uint Unknown2213; - public uint Unknown2214; - public uint Unknown2215; - public uint Unknown2216; - public uint Unknown2217; - public uint Unknown2218; - public uint Unknown2219; - public uint Unknown2220; - public uint Unknown2221; - public uint Unknown2222; - public uint Unknown2223; - public uint Unknown2224; - public uint Unknown2225; - public uint Unknown2226; - public uint Unknown2227; - public uint Unknown2228; - public uint Unknown2229; - public uint Unknown2230; - public uint Unknown2231; - public uint Unknown2232; - public uint Unknown2233; - public uint Unknown2234; - public uint Unknown2235; - public uint Unknown2236; - public uint Unknown2237; - public uint Unknown2238; - public uint Unknown2239; - public uint Unknown2240; - public uint Unknown2241; - public uint Unknown2242; - public uint Unknown2243; - public uint Unknown2244; - public uint Unknown2245; - public uint Unknown2246; - public uint Unknown2247; - public uint Unknown2248; - public uint Unknown2249; - public uint Unknown2250; - public uint Unknown2251; - public uint Unknown2252; - public uint Unknown2253; - public uint Unknown2254; - public uint Unknown2255; - public uint Unknown2256; - public uint Unknown2257; - public uint Unknown2258; - public uint Unknown2259; - public uint Unknown2260; - public uint Unknown2261; - public uint Unknown2262; - public uint Unknown2263; - public uint Unknown2264; - public uint Unknown2265; - public uint Unknown2266; - public uint Unknown2267; - public uint Unknown2268; - public uint Unknown2269; - public uint Unknown2270; - public uint Unknown2271; - public uint Unknown2272; - public uint Unknown2273; - public uint Unknown2274; - public uint Unknown2275; - public uint Unknown2276; - public uint Unknown2277; - public uint Unknown2278; - public uint Unknown2279; - public uint Unknown2280; - public uint Unknown2281; - public uint Unknown2282; - public uint Unknown2283; - public uint Unknown2284; - public uint Unknown2285; - public uint Unknown2286; - public uint Unknown2287; - public uint Unknown2288; - public uint Unknown2289; - public uint Unknown2290; - public uint Unknown2291; - public uint Unknown2292; - public uint Unknown2293; - public uint Unknown2294; - public uint Unknown2295; - public uint Unknown2296; - public uint Unknown2297; - public uint Unknown2298; - public uint Unknown2299; - public uint Unknown2300; - public uint Unknown2301; - public uint Unknown2302; - public uint Unknown2303; - public uint Unknown2304; - public uint Unknown2305; - public uint Unknown2306; - public uint Unknown2307; - public uint Unknown2308; - public uint Unknown2309; - public uint Unknown2310; - public uint Unknown2311; - public uint Unknown2312; - public uint Unknown2313; - public uint Unknown2314; - public uint Unknown2315; - public uint Unknown2316; - public uint Unknown2317; - public uint Unknown2318; - public uint Unknown2319; - public uint Unknown2320; - public uint Unknown2321; - public uint Unknown2322; - public uint Unknown2323; - public uint Unknown2324; - public uint Unknown2325; - public uint Unknown2326; - public uint Unknown2327; - public uint Unknown2328; - public uint Unknown2329; - public uint Unknown2330; - public uint Unknown2331; - public uint Unknown2332; - public uint Unknown2333; - public uint Unknown2334; - public uint Unknown2335; - public uint Unknown2336; - public uint Unknown2337; - public uint Unknown2338; - public uint Unknown2339; - public uint Unknown2340; - public uint Unknown2341; - public uint Unknown2342; - public uint Unknown2343; - public uint Unknown2344; - public uint Unknown2345; - public uint Unknown2346; - public uint Unknown2347; - public uint Unknown2348; - public uint Unknown2349; - public uint Unknown2350; - public uint Unknown2351; - public uint Unknown2352; - public uint Unknown2353; - public uint Unknown2354; - public uint Unknown2355; - public uint Unknown2356; - public uint Unknown2357; - public uint Unknown2358; - public uint Unknown2359; - public uint Unknown2360; - public uint Unknown2361; - public uint Unknown2362; - public uint Unknown2363; - public uint Unknown2364; - public uint Unknown2365; - public uint Unknown2366; - public uint Unknown2367; - public uint Unknown2368; - public uint Unknown2369; - public uint Unknown2370; - public uint Unknown2371; - public uint Unknown2372; - public uint Unknown2373; - public uint Unknown2374; - public uint Unknown2375; - public uint Unknown2376; - public uint Unknown2377; - public uint Unknown2378; - public uint Unknown2379; - public uint Unknown2380; - public uint Unknown2381; - public uint Unknown2382; - public uint Unknown2383; - public uint Unknown2384; - public uint Unknown2385; - public uint Unknown2386; - public uint Unknown2387; - public uint Unknown2388; - public uint Unknown2389; - public uint Unknown2390; - public uint Unknown2391; - public uint Unknown2392; - public uint Unknown2393; - public uint Unknown2394; - public uint Unknown2395; - public uint Unknown2396; - public uint Unknown2397; - public uint Unknown2398; - public uint Unknown2399; - public uint Unknown2400; - public uint Unknown2401; - public uint Unknown2402; - public uint Unknown2403; - public uint Unknown2404; - public uint Unknown2405; - public uint Unknown2406; - public uint Unknown2407; - public uint Unknown2408; - public uint Unknown2409; - public uint Unknown2410; - public uint Unknown2411; - public uint Unknown2412; - public uint Unknown2413; - public uint Unknown2414; - public uint Unknown2415; - public uint Unknown2416; - public uint Unknown2417; - public uint Unknown2418; - public uint Unknown2419; - public uint Unknown2420; - public uint Unknown2421; - public uint Unknown2422; - public uint Unknown2423; - public uint Unknown2424; - public uint Unknown2425; - public uint Unknown2426; - public uint Unknown2427; - public uint Unknown2428; - public uint Unknown2429; - public uint Unknown2430; - public uint Unknown2431; - public uint Unknown2432; - public uint Unknown2433; - public uint Unknown2434; - public uint Unknown2435; - public uint Unknown2436; - public uint Unknown2437; - public uint Unknown2438; - public uint Unknown2439; - public uint Unknown2440; - public uint Unknown2441; - public uint Unknown2442; - public uint Unknown2443; - public uint Unknown2444; - public uint Unknown2445; - public uint Unknown2446; - public uint Unknown2447; - public uint Unknown2448; - public uint Unknown2449; - public uint Unknown2450; - public uint Unknown2451; - public uint Unknown2452; - public uint Unknown2453; - public uint Unknown2454; - public uint Unknown2455; - public uint Unknown2456; - public uint Unknown2457; - public uint Unknown2458; - public uint Unknown2459; - public uint Unknown2460; - public uint Unknown2461; - public uint Unknown2462; - public uint Unknown2463; - public uint Unknown2464; - public uint Unknown2465; - public uint Unknown2466; - public uint Unknown2467; - public uint Unknown2468; - public uint Unknown2469; - public uint Unknown2470; - public uint Unknown2471; - public uint Unknown2472; - public uint Unknown2473; - public uint Unknown2474; - public uint Unknown2475; - public uint Unknown2476; - public uint Unknown2477; - public uint Unknown2478; - public uint Unknown2479; - public uint Unknown2480; - public uint Unknown2481; - public uint Unknown2482; - public uint Unknown2483; - public uint Unknown2484; - public uint Unknown2485; - public uint Unknown2486; - public uint Unknown2487; - public uint Unknown2488; - public uint Unknown2489; - public uint Unknown2490; - public uint Unknown2491; - public uint Unknown2492; - public uint Unknown2493; - public uint Unknown2494; - public uint Unknown2495; - public uint Unknown2496; - public uint Unknown2497; - public uint Unknown2498; - public uint Unknown2499; - public uint Unknown2500; - public uint Unknown2501; - public uint Unknown2502; - public uint Unknown2503; - public uint Unknown2504; - public uint Unknown2505; - public uint Unknown2506; - public uint Unknown2507; - public uint Unknown2508; - public uint Unknown2509; - public uint Unknown2510; - public uint Unknown2511; - public uint Unknown2512; - public uint Unknown2513; - public uint Unknown2514; - public uint Unknown2515; - public uint Unknown2516; - public uint Unknown2517; - public uint Unknown2518; - public uint Unknown2519; - public uint Unknown2520; - public uint Unknown2521; - public uint Unknown2522; - public uint Unknown2523; - public uint Unknown2524; - public uint Unknown2525; - public uint Unknown2526; - public uint Unknown2527; - public uint Unknown2528; - public uint Unknown2529; - public uint Unknown2530; - public uint Unknown2531; - public uint Unknown2532; - public uint Unknown2533; - public uint Unknown2534; - public uint Unknown2535; - public uint Unknown2536; - public uint Unknown2537; - public uint Unknown2538; - public uint Unknown2539; - public uint Unknown2540; - public uint Unknown2541; - public uint Unknown2542; - public uint Unknown2543; - public uint Unknown2544; - public uint Unknown2545; - public uint Unknown2546; - public uint Unknown2547; - public uint Unknown2548; - public uint Unknown2549; - public uint Unknown2550; - public uint Unknown2551; - public uint Unknown2552; - public uint Unknown2553; - public uint Unknown2554; - public uint Unknown2555; - public uint Unknown2556; - public uint Unknown2557; - public uint Unknown2558; - public uint Unknown2559; - public uint Unknown2560; - public uint Unknown2561; - public uint Unknown2562; - public uint Unknown2563; - public uint Unknown2564; - public uint Unknown2565; - public uint Unknown2566; - public uint Unknown2567; - public uint Unknown2568; - public uint Unknown2569; - public uint Unknown2570; - public uint Unknown2571; - public uint Unknown2572; - public uint Unknown2573; - public uint Unknown2574; - public uint Unknown2575; - public uint Unknown2576; - public uint Unknown2577; - public uint Unknown2578; - public uint Unknown2579; - public uint Unknown2580; - public uint Unknown2581; - public uint Unknown2582; - public uint Unknown2583; - public uint Unknown2584; - public uint Unknown2585; - public uint Unknown2586; - public uint Unknown2587; - public uint Unknown2588; - public uint Unknown2589; - public uint Unknown2590; - public uint Unknown2591; - public uint Unknown2592; - public uint Unknown2593; - public uint Unknown2594; - public uint Unknown2595; - public uint Unknown2596; - public uint Unknown2597; - public uint Unknown2598; - public uint Unknown2599; - public uint Unknown2600; - public uint Unknown2601; - public uint Unknown2602; - public uint Unknown2603; - public uint Unknown2604; - public uint Unknown2605; - public uint Unknown2606; - public uint Unknown2607; - public uint Unknown2608; - public uint Unknown2609; - public uint Unknown2610; - public uint Unknown2611; - public uint Unknown2612; - public uint Unknown2613; - public uint Unknown2614; - public uint Unknown2615; - public uint Unknown2616; - public uint Unknown2617; - public uint Unknown2618; - public uint Unknown2619; - public uint Unknown2620; - public uint Unknown2621; - public uint Unknown2622; - public uint Unknown2623; - public uint Unknown2624; - public uint Unknown2625; - public uint Unknown2626; - public uint Unknown2627; - public uint Unknown2628; - public uint Unknown2629; - public uint Unknown2630; - public uint Unknown2631; - public uint Unknown2632; - public uint Unknown2633; - public uint Unknown2634; - public uint Unknown2635; - public uint Unknown2636; - public uint Unknown2637; - public uint Unknown2638; - public uint Unknown2639; - public uint Unknown2640; - public uint Unknown2641; - public uint Unknown2642; - public uint Unknown2643; - public uint Unknown2644; - public uint Unknown2645; - public uint Unknown2646; - public uint Unknown2647; - public uint Unknown2648; - public uint Unknown2649; - public uint Unknown2650; - public uint Unknown2651; - public uint Unknown2652; - public uint Unknown2653; - public uint Unknown2654; - public uint Unknown2655; - public uint Unknown2656; - public uint Unknown2657; - public uint Unknown2658; - public uint Unknown2659; - public uint Unknown2660; - public uint Unknown2661; - public uint Unknown2662; - public uint Unknown2663; - public uint Unknown2664; - public uint Unknown2665; - public uint Unknown2666; - public uint Unknown2667; - public uint Unknown2668; - public uint Unknown2669; - public uint Unknown2670; - public uint Unknown2671; - public uint Unknown2672; - public uint Unknown2673; - public uint Unknown2674; - public uint Unknown2675; - public uint Unknown2676; - public uint Unknown2677; - public uint Unknown2678; - public uint Unknown2679; - public uint Unknown2680; - public uint Unknown2681; - public uint Unknown2682; - public uint Unknown2683; - public uint Unknown2684; - public uint Unknown2685; - public uint Unknown2686; - public uint Unknown2687; - public uint Unknown2688; - public uint Unknown2689; - public uint Unknown2690; - public uint Unknown2691; - public uint Unknown2692; - public uint Unknown2693; - public uint Unknown2694; - public uint Unknown2695; - public uint Unknown2696; - public uint Unknown2697; - public uint Unknown2698; - public uint Unknown2699; - public uint Unknown2700; - public uint Unknown2701; - public uint Unknown2702; - public uint Unknown2703; - public uint Unknown2704; - public uint Unknown2705; - public uint Unknown2706; - public uint Unknown2707; - public uint Unknown2708; - public uint Unknown2709; - public uint Unknown2710; - public uint Unknown2711; - public uint Unknown2712; - public uint Unknown2713; - public uint Unknown2714; - public uint Unknown2715; - public uint Unknown2716; - public uint Unknown2717; - public uint Unknown2718; - public uint Unknown2719; - public uint Unknown2720; - public uint Unknown2721; - public uint Unknown2722; - public uint Unknown2723; - public uint Unknown2724; - public uint Unknown2725; - public uint Unknown2726; - public uint Unknown2727; - public uint Unknown2728; - public uint Unknown2729; - public uint Unknown2730; - public uint Unknown2731; - public uint Unknown2732; - public uint Unknown2733; - public uint Unknown2734; - public uint Unknown2735; - public uint Unknown2736; - public uint Unknown2737; - public uint Unknown2738; - public uint Unknown2739; - public uint Unknown2740; - public uint Unknown2741; - public uint Unknown2742; - public uint Unknown2743; - public uint Unknown2744; - public uint Unknown2745; - public uint Unknown2746; - public uint Unknown2747; - public uint Unknown2748; - public uint Unknown2749; - public uint Unknown2750; - public uint Unknown2751; - public uint Unknown2752; - public uint Unknown2753; - public uint Unknown2754; - public uint Unknown2755; - public uint Unknown2756; - public uint Unknown2757; - public uint Unknown2758; - public uint Unknown2759; - public uint Unknown2760; - public uint Unknown2761; - public uint Unknown2762; - public uint Unknown2763; - public uint Unknown2764; - public uint Unknown2765; - public uint Unknown2766; - public uint Unknown2767; - public uint Unknown2768; - public uint Unknown2769; - public uint Unknown2770; - public uint Unknown2771; - public uint Unknown2772; - public uint Unknown2773; - public uint Unknown2774; - public uint Unknown2775; - public uint Unknown2776; - public uint Unknown2777; - public uint Unknown2778; - public uint Unknown2779; - public uint Unknown2780; - public uint Unknown2781; - public uint Unknown2782; - public uint Unknown2783; - public uint Unknown2784; - public uint Unknown2785; - public uint Unknown2786; - public uint Unknown2787; - public uint Unknown2788; - public uint Unknown2789; - public uint Unknown2790; - public uint Unknown2791; - public uint Unknown2792; - public uint Unknown2793; - public uint Unknown2794; - public uint Unknown2795; - public uint Unknown2796; - public uint Unknown2797; - public uint Unknown2798; - public uint Unknown2799; - public uint Unknown2800; - public uint Unknown2801; - public uint Unknown2802; - public uint Unknown2803; - public uint Unknown2804; - public uint Unknown2805; - public uint Unknown2806; - public uint Unknown2807; - public uint Unknown2808; - public uint Unknown2809; - public uint Unknown2810; - public uint Unknown2811; - public uint Unknown2812; - public uint Unknown2813; - public uint Unknown2814; - public uint Unknown2815; - public uint Unknown2816; - public uint Unknown2817; - public uint Unknown2818; - public uint Unknown2819; - public uint Unknown2820; - public uint Unknown2821; - public uint Unknown2822; - public uint Unknown2823; - public uint Unknown2824; - public uint Unknown2825; - public uint Unknown2826; - public uint Unknown2827; - public uint Unknown2828; - public uint Unknown2829; - public uint Unknown2830; - public uint Unknown2831; - public uint Unknown2832; - public uint Unknown2833; - public uint Unknown2834; - public uint Unknown2835; - public uint Unknown2836; - public uint Unknown2837; - public uint Unknown2838; - public uint Unknown2839; - public uint Unknown2840; - public uint Unknown2841; - public uint Unknown2842; - public uint Unknown2843; - public uint Unknown2844; - public uint Unknown2845; - public uint Unknown2846; - public uint Unknown2847; - public uint Unknown2848; - public uint Unknown2849; - public uint Unknown2850; - public uint Unknown2851; - public uint Unknown2852; - public uint Unknown2853; - public uint Unknown2854; - public uint Unknown2855; - public uint Unknown2856; - public uint Unknown2857; - public uint Unknown2858; - public uint Unknown2859; - public uint Unknown2860; - public uint Unknown2861; - public uint Unknown2862; - public uint Unknown2863; - public uint Unknown2864; - public uint Unknown2865; - public uint Unknown2866; - public uint Unknown2867; - public uint Unknown2868; - public uint Unknown2869; - public uint Unknown2870; - public uint Unknown2871; - public uint Unknown2872; - public uint Unknown2873; - public uint Unknown2874; - public uint Unknown2875; - public uint Unknown2876; - public uint Unknown2877; - public uint Unknown2878; - public uint Unknown2879; - public uint Unknown2880; - public uint Unknown2881; - public uint Unknown2882; - public uint Unknown2883; - public uint Unknown2884; - public uint Unknown2885; - public uint Unknown2886; - public uint Unknown2887; - public uint Unknown2888; - public uint Unknown2889; - public uint Unknown2890; - public uint Unknown2891; - public uint Unknown2892; - public uint Unknown2893; - public uint Unknown2894; - public uint Unknown2895; - public uint Unknown2896; - public uint Unknown2897; - public uint Unknown2898; - public uint Unknown2899; - public uint Unknown2900; - public uint Unknown2901; - public uint Unknown2902; - public uint Unknown2903; - public uint Unknown2904; - public uint Unknown2905; - public uint Unknown2906; - public uint Unknown2907; - public uint Unknown2908; - public uint Unknown2909; - public uint Unknown2910; - public uint Unknown2911; - public uint Unknown2912; - public uint Unknown2913; - public uint Unknown2914; - public uint Unknown2915; - public uint Unknown2916; - public uint Unknown2917; - public uint Unknown2918; - public uint Unknown2919; - public uint Unknown2920; - public uint Unknown2921; - public uint Unknown2922; - public uint Unknown2923; - public uint Unknown2924; - public uint Unknown2925; - public uint Unknown2926; - public uint Unknown2927; - public uint Unknown2928; - public uint Unknown2929; - public uint Unknown2930; - public uint Unknown2931; - public uint Unknown2932; - public uint Unknown2933; - public uint Unknown2934; - public uint Unknown2935; - public uint Unknown2936; - public uint Unknown2937; - public uint Unknown2938; - public uint Unknown2939; - public uint Unknown2940; - public uint Unknown2941; - public uint Unknown2942; - public uint Unknown2943; - public uint Unknown2944; - public uint Unknown2945; - public uint Unknown2946; - public uint Unknown2947; - public uint Unknown2948; - public uint Unknown2949; - public uint Unknown2950; - public uint Unknown2951; - public uint Unknown2952; - public uint Unknown2953; - public uint Unknown2954; - public uint Unknown2955; - public uint Unknown2956; - public uint Unknown2957; - public uint Unknown2958; - public uint Unknown2959; - public uint Unknown2960; - public uint Unknown2961; - public uint Unknown2962; - public uint Unknown2963; - public uint Unknown2964; - public uint Unknown2965; - public uint Unknown2966; - public uint Unknown2967; - public uint Unknown2968; - public uint Unknown2969; - public uint Unknown2970; - public uint Unknown2971; - public uint Unknown2972; - public uint Unknown2973; - public uint Unknown2974; - public uint Unknown2975; - public uint Unknown2976; - public uint Unknown2977; - public uint Unknown2978; - public uint Unknown2979; - public uint Unknown2980; - public uint Unknown2981; - public uint Unknown2982; - public uint Unknown2983; - public uint Unknown2984; - public uint Unknown2985; - public uint Unknown2986; - public uint Unknown2987; - public uint Unknown2988; - public uint Unknown2989; - public uint Unknown2990; - public uint Unknown2991; - public uint Unknown2992; - public uint Unknown2993; - public uint Unknown2994; - public uint Unknown2995; - public uint Unknown2996; - public uint Unknown2997; - public uint Unknown2998; - public UnkStruct2999Struct[] UnkStruct2999; - public byte Unknown3009; - public byte Unknown3010; - public byte Unknown3011; - public byte Unknown3012; - public byte Unknown3013; - public byte Unknown3014; - public byte Unknown3015; - public byte Unknown3016; - public byte Unknown3017; - public byte Unknown3018; - public byte Unknown3019; - public byte Unknown3020; - public byte Unknown3021; - public byte Unknown3022; - public byte Unknown3023; - public byte Unknown3024; - public byte Unknown3025; - public byte Unknown3026; - public byte Unknown3027; - public byte Unknown3028; - public byte Unknown3029; - public byte Unknown3030; - public byte Unknown3031; - public byte Unknown3032; - public byte Unknown3033; - public byte Unknown3034; - public byte Unknown3035; - public byte Unknown3036; - public byte Unknown3037; - public byte Unknown3038; - public byte Unknown3039; - public byte Unknown3040; - public byte Unknown3041; - public byte Unknown3042; - public byte Unknown3043; - public byte Unknown3044; - public byte Unknown3045; - public byte Unknown3046; - public byte Unknown3047; - public byte Unknown3048; - public byte Unknown3049; - public byte Unknown3050; - public byte Unknown3051; - public byte Unknown3052; - public byte Unknown3053; - public byte Unknown3054; - public byte Unknown3055; - public byte Unknown3056; - public byte Unknown3057; - public byte Unknown3058; - public byte Unknown3059; - public byte Unknown3060; - public byte Unknown3061; - public byte Unknown3062; - public byte Unknown3063; - public byte Unknown3064; - public byte Unknown3065; - public byte Unknown3066; - public byte Unknown3067; - public byte Unknown3068; - public byte Unknown3069; - public byte Unknown3070; - public byte Unknown3071; - public byte Unknown3072; - public byte Unknown3073; - public byte Unknown3074; - public byte Unknown3075; - public byte Unknown3076; - public byte Unknown3077; - public byte Unknown3078; - public byte Unknown3079; - public byte Unknown3080; - public byte Unknown3081; - public byte Unknown3082; - public byte Unknown3083; - public byte Unknown3084; - public byte Unknown3085; - public byte Unknown3086; - public byte Unknown3087; - public byte Unknown3088; - public byte Unknown3089; - public byte Unknown3090; - public byte Unknown3091; - public byte Unknown3092; - public byte Unknown3093; - public byte Unknown3094; - public byte Unknown3095; - public byte Unknown3096; - public byte Unknown3097; - public byte Unknown3098; - public byte Unknown3099; - public byte Unknown3100; - public byte Unknown3101; - public byte Unknown3102; - public byte Unknown3103; - public byte Unknown3104; - public byte Unknown3105; - public byte Unknown3106; - public byte Unknown3107; - public byte Unknown3108; - public byte Unknown3109; - public byte Unknown3110; - public byte Unknown3111; - public byte Unknown3112; - public byte Unknown3113; - public byte Unknown3114; - public byte Unknown3115; - public byte Unknown3116; - public byte Unknown3117; - public byte Unknown3118; - public byte Unknown3119; - public byte Unknown3120; - public byte Unknown3121; - public byte Unknown3122; - public byte Unknown3123; - public byte Unknown3124; - public byte Unknown3125; - public byte Unknown3126; - public byte Unknown3127; - public byte Unknown3128; - public byte Unknown3129; - public byte Unknown3130; - public byte Unknown3131; - public byte Unknown3132; - public byte Unknown3133; - public byte Unknown3134; - public byte Unknown3135; - public byte Unknown3136; - public byte Unknown3137; - public byte Unknown3138; - public byte Unknown3139; - public byte Unknown3140; - public byte Unknown3141; - public byte Unknown3142; - public byte Unknown3143; - public byte Unknown3144; - public byte Unknown3145; - public byte Unknown3146; - public byte Unknown3147; - public byte Unknown3148; - public byte Unknown3149; - public byte Unknown3150; - public byte Unknown3151; - public byte Unknown3152; - public byte Unknown3153; - public byte Unknown3154; - public byte Unknown3155; - public byte Unknown3156; - public byte Unknown3157; - public byte Unknown3158; - public byte Unknown3159; - public byte Unknown3160; - public byte Unknown3161; - public byte Unknown3162; - public byte Unknown3163; - public byte Unknown3164; - public byte Unknown3165; - public byte Unknown3166; - public byte Unknown3167; - public byte Unknown3168; - public byte Unknown3169; - public byte Unknown3170; - public byte Unknown3171; - public byte Unknown3172; - public byte Unknown3173; - public byte Unknown3174; - public byte Unknown3175; - public byte Unknown3176; - public byte Unknown3177; - public byte Unknown3178; - public byte Unknown3179; - public byte Unknown3180; - public byte Unknown3181; - public byte Unknown3182; - public byte Unknown3183; - public byte Unknown3184; - public byte Unknown3185; - public byte Unknown3186; - public byte Unknown3187; - public byte Unknown3188; - public byte Unknown3189; - public byte Unknown3190; - public byte Unknown3191; - public byte Unknown3192; - public byte Unknown3193; - public byte Unknown3194; - public byte Unknown3195; - public byte Unknown3196; - public byte Unknown3197; - public byte Unknown3198; - public byte Unknown3199; - public byte Unknown3200; - public byte Unknown3201; - public byte Unknown3202; - public byte Unknown3203; - public byte Unknown3204; - public byte Unknown3205; - public byte Unknown3206; - public byte Unknown3207; - public byte Unknown3208; - public byte Unknown3209; - public byte Unknown3210; - public byte Unknown3211; - public byte Unknown3212; - public byte Unknown3213; - public byte Unknown3214; - public byte Unknown3215; - public byte Unknown3216; - public byte Unknown3217; - public byte Unknown3218; - public byte Unknown3219; - public byte Unknown3220; - public byte Unknown3221; - public byte Unknown3222; - public byte Unknown3223; - public byte Unknown3224; - public byte Unknown3225; - public byte Unknown3226; - public byte Unknown3227; - public byte Unknown3228; - public byte Unknown3229; - public byte Unknown3230; - public byte Unknown3231; - public byte Unknown3232; - public byte Unknown3233; - public byte Unknown3234; - public byte Unknown3235; - public byte Unknown3236; - public byte Unknown3237; - public byte Unknown3238; - public byte Unknown3239; - public byte Unknown3240; - public byte Unknown3241; - public byte Unknown3242; - public byte Unknown3243; - public byte Unknown3244; - public byte Unknown3245; - public byte Unknown3246; - public byte Unknown3247; - public byte Unknown3248; - public byte Unknown3249; - public byte Unknown3250; - public byte Unknown3251; - public byte Unknown3252; - public byte Unknown3253; - public byte Unknown3254; - public byte Unknown3255; - public byte Unknown3256; - public byte Unknown3257; - public byte Unknown3258; - public byte Unknown3259; - public byte Unknown3260; - public byte Unknown3261; - public byte Unknown3262; - public byte Unknown3263; - public byte Unknown3264; - public byte Unknown3265; - public byte Unknown3266; - public byte Unknown3267; - public byte Unknown3268; - public byte Unknown3269; - public byte Unknown3270; - public byte Unknown3271; - public byte Unknown3272; - public byte Unknown3273; - public byte Unknown3274; - public byte Unknown3275; - public byte Unknown3276; - public byte Unknown3277; - public byte Unknown3278; - public byte[] VoiceStruct; - public int[] Unknown3291; - public int Unknown3298; - public int Unknown3299; - public int Unknown3300; - public int Unknown3301; - public int Unknown3302; - public int Unknown3303; - public int Unknown3304; - public int Unknown3305; - public int Unknown3306; - public int Unknown3307; - public int Unknown3308; - public int Unknown3309; - public int Unknown3310; - public int Unknown3311; - public int Unknown3312; - public int Unknown3313; - public int Unknown3314; - public int Unknown3315; - public int Unknown3316; - public int Unknown3317; - public int Unknown3318; - public int Unknown3319; - public int Unknown3320; - public int Unknown3321; - public int Unknown3322; - public int Unknown3323; - public int Unknown3324; - public int Unknown3325; - public int Unknown3326; - public int Unknown3327; - public int Unknown3328; - public int Unknown3329; - public int Unknown3330; - public int Unknown3331; - public int Unknown3332; - public int Unknown3333; - public int Unknown3334; - public int Unknown3335; - public int Unknown3336; - public int Unknown3337; - public int Unknown3338; - public int Unknown3339; - public int Unknown3340; - public int Unknown3341; - public int Unknown3342; - public int Unknown3343; - public int Unknown3344; - public int Unknown3345; - public int Unknown3346; - public UnkStruct3347Struct[] UnkStruct3347; - public ulong Unknown3354; - public ulong Unknown3355; - public ulong Unknown3356; - public ulong Unknown3357; - public ulong Unknown3358; - public ulong Unknown3359; - public ulong Unknown3360; - public ulong Unknown3361; - public ulong Unknown3362; - public ulong Unknown3363; - public ulong Unknown3364; - public ulong Unknown3365; - public ulong Unknown3366; - public ulong Unknown3367; + public LazyRow< Race > Race { get; set; } + public LazyRow< Tribe > Tribe { get; set; } + public sbyte Gender { get; set; } + public uint[] Menu { get; set; } + public byte[] InitVal { get; set; } + public byte[] SubMenuType { get; set; } + public byte[] SubMenuNum { get; set; } + public byte[] LookAt { get; set; } + public uint[] SubMenuMask { get; set; } + public uint[] Customize { get; set; } + public UnkStruct199Struct[] UnkStruct199 { get; set; } + public uint Unknown299 { get; set; } + public uint Unknown300 { get; set; } + public uint Unknown301 { get; set; } + public uint Unknown302 { get; set; } + public uint Unknown303 { get; set; } + public uint Unknown304 { get; set; } + public uint Unknown305 { get; set; } + public uint Unknown306 { get; set; } + public uint Unknown307 { get; set; } + public uint Unknown308 { get; set; } + public uint Unknown309 { get; set; } + public uint Unknown310 { get; set; } + public uint Unknown311 { get; set; } + public uint Unknown312 { get; set; } + public uint Unknown313 { get; set; } + public uint Unknown314 { get; set; } + public uint Unknown315 { get; set; } + public uint Unknown316 { get; set; } + public uint Unknown317 { get; set; } + public uint Unknown318 { get; set; } + public uint Unknown319 { get; set; } + public uint Unknown320 { get; set; } + public uint Unknown321 { get; set; } + public uint Unknown322 { get; set; } + public uint Unknown323 { get; set; } + public uint Unknown324 { get; set; } + public uint Unknown325 { get; set; } + public uint Unknown326 { get; set; } + public uint Unknown327 { get; set; } + public uint Unknown328 { get; set; } + public uint Unknown329 { get; set; } + public uint Unknown330 { get; set; } + public uint Unknown331 { get; set; } + public uint Unknown332 { get; set; } + public uint Unknown333 { get; set; } + public uint Unknown334 { get; set; } + public uint Unknown335 { get; set; } + public uint Unknown336 { get; set; } + public uint Unknown337 { get; set; } + public uint Unknown338 { get; set; } + public uint Unknown339 { get; set; } + public uint Unknown340 { get; set; } + public uint Unknown341 { get; set; } + public uint Unknown342 { get; set; } + public uint Unknown343 { get; set; } + public uint Unknown344 { get; set; } + public uint Unknown345 { get; set; } + public uint Unknown346 { get; set; } + public uint Unknown347 { get; set; } + public uint Unknown348 { get; set; } + public uint Unknown349 { get; set; } + public uint Unknown350 { get; set; } + public uint Unknown351 { get; set; } + public uint Unknown352 { get; set; } + public uint Unknown353 { get; set; } + public uint Unknown354 { get; set; } + public uint Unknown355 { get; set; } + public uint Unknown356 { get; set; } + public uint Unknown357 { get; set; } + public uint Unknown358 { get; set; } + public uint Unknown359 { get; set; } + public uint Unknown360 { get; set; } + public uint Unknown361 { get; set; } + public uint Unknown362 { get; set; } + public uint Unknown363 { get; set; } + public uint Unknown364 { get; set; } + public uint Unknown365 { get; set; } + public uint Unknown366 { get; set; } + public uint Unknown367 { get; set; } + public uint Unknown368 { get; set; } + public uint Unknown369 { get; set; } + public uint Unknown370 { get; set; } + public uint Unknown371 { get; set; } + public uint Unknown372 { get; set; } + public uint Unknown373 { get; set; } + public uint Unknown374 { get; set; } + public uint Unknown375 { get; set; } + public uint Unknown376 { get; set; } + public uint Unknown377 { get; set; } + public uint Unknown378 { get; set; } + public uint Unknown379 { get; set; } + public uint Unknown380 { get; set; } + public uint Unknown381 { get; set; } + public uint Unknown382 { get; set; } + public uint Unknown383 { get; set; } + public uint Unknown384 { get; set; } + public uint Unknown385 { get; set; } + public uint Unknown386 { get; set; } + public uint Unknown387 { get; set; } + public uint Unknown388 { get; set; } + public uint Unknown389 { get; set; } + public uint Unknown390 { get; set; } + public uint Unknown391 { get; set; } + public uint Unknown392 { get; set; } + public uint Unknown393 { get; set; } + public uint Unknown394 { get; set; } + public uint Unknown395 { get; set; } + public uint Unknown396 { get; set; } + public uint Unknown397 { get; set; } + public uint Unknown398 { get; set; } + public uint Unknown399 { get; set; } + public uint Unknown400 { get; set; } + public uint Unknown401 { get; set; } + public uint Unknown402 { get; set; } + public uint Unknown403 { get; set; } + public uint Unknown404 { get; set; } + public uint Unknown405 { get; set; } + public uint Unknown406 { get; set; } + public uint Unknown407 { get; set; } + public uint Unknown408 { get; set; } + public uint Unknown409 { get; set; } + public uint Unknown410 { get; set; } + public uint Unknown411 { get; set; } + public uint Unknown412 { get; set; } + public uint Unknown413 { get; set; } + public uint Unknown414 { get; set; } + public uint Unknown415 { get; set; } + public uint Unknown416 { get; set; } + public uint Unknown417 { get; set; } + public uint Unknown418 { get; set; } + public uint Unknown419 { get; set; } + public uint Unknown420 { get; set; } + public uint Unknown421 { get; set; } + public uint Unknown422 { get; set; } + public uint Unknown423 { get; set; } + public uint Unknown424 { get; set; } + public uint Unknown425 { get; set; } + public uint Unknown426 { get; set; } + public uint Unknown427 { get; set; } + public uint Unknown428 { get; set; } + public uint Unknown429 { get; set; } + public uint Unknown430 { get; set; } + public uint Unknown431 { get; set; } + public uint Unknown432 { get; set; } + public uint Unknown433 { get; set; } + public uint Unknown434 { get; set; } + public uint Unknown435 { get; set; } + public uint Unknown436 { get; set; } + public uint Unknown437 { get; set; } + public uint Unknown438 { get; set; } + public uint Unknown439 { get; set; } + public uint Unknown440 { get; set; } + public uint Unknown441 { get; set; } + public uint Unknown442 { get; set; } + public uint Unknown443 { get; set; } + public uint Unknown444 { get; set; } + public uint Unknown445 { get; set; } + public uint Unknown446 { get; set; } + public uint Unknown447 { get; set; } + public uint Unknown448 { get; set; } + public uint Unknown449 { get; set; } + public uint Unknown450 { get; set; } + public uint Unknown451 { get; set; } + public uint Unknown452 { get; set; } + public uint Unknown453 { get; set; } + public uint Unknown454 { get; set; } + public uint Unknown455 { get; set; } + public uint Unknown456 { get; set; } + public uint Unknown457 { get; set; } + public uint Unknown458 { get; set; } + public uint Unknown459 { get; set; } + public uint Unknown460 { get; set; } + public uint Unknown461 { get; set; } + public uint Unknown462 { get; set; } + public uint Unknown463 { get; set; } + public uint Unknown464 { get; set; } + public uint Unknown465 { get; set; } + public uint Unknown466 { get; set; } + public uint Unknown467 { get; set; } + public uint Unknown468 { get; set; } + public uint Unknown469 { get; set; } + public uint Unknown470 { get; set; } + public uint Unknown471 { get; set; } + public uint Unknown472 { get; set; } + public uint Unknown473 { get; set; } + public uint Unknown474 { get; set; } + public uint Unknown475 { get; set; } + public uint Unknown476 { get; set; } + public uint Unknown477 { get; set; } + public uint Unknown478 { get; set; } + public uint Unknown479 { get; set; } + public uint Unknown480 { get; set; } + public uint Unknown481 { get; set; } + public uint Unknown482 { get; set; } + public uint Unknown483 { get; set; } + public uint Unknown484 { get; set; } + public uint Unknown485 { get; set; } + public uint Unknown486 { get; set; } + public uint Unknown487 { get; set; } + public uint Unknown488 { get; set; } + public uint Unknown489 { get; set; } + public uint Unknown490 { get; set; } + public uint Unknown491 { get; set; } + public uint Unknown492 { get; set; } + public uint Unknown493 { get; set; } + public uint Unknown494 { get; set; } + public uint Unknown495 { get; set; } + public uint Unknown496 { get; set; } + public uint Unknown497 { get; set; } + public uint Unknown498 { get; set; } + public uint Unknown499 { get; set; } + public uint Unknown500 { get; set; } + public uint Unknown501 { get; set; } + public uint Unknown502 { get; set; } + public uint Unknown503 { get; set; } + public uint Unknown504 { get; set; } + public uint Unknown505 { get; set; } + public uint Unknown506 { get; set; } + public uint Unknown507 { get; set; } + public uint Unknown508 { get; set; } + public uint Unknown509 { get; set; } + public uint Unknown510 { get; set; } + public uint Unknown511 { get; set; } + public uint Unknown512 { get; set; } + public uint Unknown513 { get; set; } + public uint Unknown514 { get; set; } + public uint Unknown515 { get; set; } + public uint Unknown516 { get; set; } + public uint Unknown517 { get; set; } + public uint Unknown518 { get; set; } + public uint Unknown519 { get; set; } + public uint Unknown520 { get; set; } + public uint Unknown521 { get; set; } + public uint Unknown522 { get; set; } + public uint Unknown523 { get; set; } + public uint Unknown524 { get; set; } + public uint Unknown525 { get; set; } + public uint Unknown526 { get; set; } + public uint Unknown527 { get; set; } + public uint Unknown528 { get; set; } + public uint Unknown529 { get; set; } + public uint Unknown530 { get; set; } + public uint Unknown531 { get; set; } + public uint Unknown532 { get; set; } + public uint Unknown533 { get; set; } + public uint Unknown534 { get; set; } + public uint Unknown535 { get; set; } + public uint Unknown536 { get; set; } + public uint Unknown537 { get; set; } + public uint Unknown538 { get; set; } + public uint Unknown539 { get; set; } + public uint Unknown540 { get; set; } + public uint Unknown541 { get; set; } + public uint Unknown542 { get; set; } + public uint Unknown543 { get; set; } + public uint Unknown544 { get; set; } + public uint Unknown545 { get; set; } + public uint Unknown546 { get; set; } + public uint Unknown547 { get; set; } + public uint Unknown548 { get; set; } + public uint Unknown549 { get; set; } + public uint Unknown550 { get; set; } + public uint Unknown551 { get; set; } + public uint Unknown552 { get; set; } + public uint Unknown553 { get; set; } + public uint Unknown554 { get; set; } + public uint Unknown555 { get; set; } + public uint Unknown556 { get; set; } + public uint Unknown557 { get; set; } + public uint Unknown558 { get; set; } + public uint Unknown559 { get; set; } + public uint Unknown560 { get; set; } + public uint Unknown561 { get; set; } + public uint Unknown562 { get; set; } + public uint Unknown563 { get; set; } + public uint Unknown564 { get; set; } + public uint Unknown565 { get; set; } + public uint Unknown566 { get; set; } + public uint Unknown567 { get; set; } + public uint Unknown568 { get; set; } + public uint Unknown569 { get; set; } + public uint Unknown570 { get; set; } + public uint Unknown571 { get; set; } + public uint Unknown572 { get; set; } + public uint Unknown573 { get; set; } + public uint Unknown574 { get; set; } + public uint Unknown575 { get; set; } + public uint Unknown576 { get; set; } + public uint Unknown577 { get; set; } + public uint Unknown578 { get; set; } + public uint Unknown579 { get; set; } + public uint Unknown580 { get; set; } + public uint Unknown581 { get; set; } + public uint Unknown582 { get; set; } + public uint Unknown583 { get; set; } + public uint Unknown584 { get; set; } + public uint Unknown585 { get; set; } + public uint Unknown586 { get; set; } + public uint Unknown587 { get; set; } + public uint Unknown588 { get; set; } + public uint Unknown589 { get; set; } + public uint Unknown590 { get; set; } + public uint Unknown591 { get; set; } + public uint Unknown592 { get; set; } + public uint Unknown593 { get; set; } + public uint Unknown594 { get; set; } + public uint Unknown595 { get; set; } + public uint Unknown596 { get; set; } + public uint Unknown597 { get; set; } + public uint Unknown598 { get; set; } + public uint Unknown599 { get; set; } + public uint Unknown600 { get; set; } + public uint Unknown601 { get; set; } + public uint Unknown602 { get; set; } + public uint Unknown603 { get; set; } + public uint Unknown604 { get; set; } + public uint Unknown605 { get; set; } + public uint Unknown606 { get; set; } + public uint Unknown607 { get; set; } + public uint Unknown608 { get; set; } + public uint Unknown609 { get; set; } + public uint Unknown610 { get; set; } + public uint Unknown611 { get; set; } + public uint Unknown612 { get; set; } + public uint Unknown613 { get; set; } + public uint Unknown614 { get; set; } + public uint Unknown615 { get; set; } + public uint Unknown616 { get; set; } + public uint Unknown617 { get; set; } + public uint Unknown618 { get; set; } + public uint Unknown619 { get; set; } + public uint Unknown620 { get; set; } + public uint Unknown621 { get; set; } + public uint Unknown622 { get; set; } + public uint Unknown623 { get; set; } + public uint Unknown624 { get; set; } + public uint Unknown625 { get; set; } + public uint Unknown626 { get; set; } + public uint Unknown627 { get; set; } + public uint Unknown628 { get; set; } + public uint Unknown629 { get; set; } + public uint Unknown630 { get; set; } + public uint Unknown631 { get; set; } + public uint Unknown632 { get; set; } + public uint Unknown633 { get; set; } + public uint Unknown634 { get; set; } + public uint Unknown635 { get; set; } + public uint Unknown636 { get; set; } + public uint Unknown637 { get; set; } + public uint Unknown638 { get; set; } + public uint Unknown639 { get; set; } + public uint Unknown640 { get; set; } + public uint Unknown641 { get; set; } + public uint Unknown642 { get; set; } + public uint Unknown643 { get; set; } + public uint Unknown644 { get; set; } + public uint Unknown645 { get; set; } + public uint Unknown646 { get; set; } + public uint Unknown647 { get; set; } + public uint Unknown648 { get; set; } + public uint Unknown649 { get; set; } + public uint Unknown650 { get; set; } + public uint Unknown651 { get; set; } + public uint Unknown652 { get; set; } + public uint Unknown653 { get; set; } + public uint Unknown654 { get; set; } + public uint Unknown655 { get; set; } + public uint Unknown656 { get; set; } + public uint Unknown657 { get; set; } + public uint Unknown658 { get; set; } + public uint Unknown659 { get; set; } + public uint Unknown660 { get; set; } + public uint Unknown661 { get; set; } + public uint Unknown662 { get; set; } + public uint Unknown663 { get; set; } + public uint Unknown664 { get; set; } + public uint Unknown665 { get; set; } + public uint Unknown666 { get; set; } + public uint Unknown667 { get; set; } + public uint Unknown668 { get; set; } + public uint Unknown669 { get; set; } + public uint Unknown670 { get; set; } + public uint Unknown671 { get; set; } + public uint Unknown672 { get; set; } + public uint Unknown673 { get; set; } + public uint Unknown674 { get; set; } + public uint Unknown675 { get; set; } + public uint Unknown676 { get; set; } + public uint Unknown677 { get; set; } + public uint Unknown678 { get; set; } + public uint Unknown679 { get; set; } + public uint Unknown680 { get; set; } + public uint Unknown681 { get; set; } + public uint Unknown682 { get; set; } + public uint Unknown683 { get; set; } + public uint Unknown684 { get; set; } + public uint Unknown685 { get; set; } + public uint Unknown686 { get; set; } + public uint Unknown687 { get; set; } + public uint Unknown688 { get; set; } + public uint Unknown689 { get; set; } + public uint Unknown690 { get; set; } + public uint Unknown691 { get; set; } + public uint Unknown692 { get; set; } + public uint Unknown693 { get; set; } + public uint Unknown694 { get; set; } + public uint Unknown695 { get; set; } + public uint Unknown696 { get; set; } + public uint Unknown697 { get; set; } + public uint Unknown698 { get; set; } + public uint Unknown699 { get; set; } + public uint Unknown700 { get; set; } + public uint Unknown701 { get; set; } + public uint Unknown702 { get; set; } + public uint Unknown703 { get; set; } + public uint Unknown704 { get; set; } + public uint Unknown705 { get; set; } + public uint Unknown706 { get; set; } + public uint Unknown707 { get; set; } + public uint Unknown708 { get; set; } + public uint Unknown709 { get; set; } + public uint Unknown710 { get; set; } + public uint Unknown711 { get; set; } + public uint Unknown712 { get; set; } + public uint Unknown713 { get; set; } + public uint Unknown714 { get; set; } + public uint Unknown715 { get; set; } + public uint Unknown716 { get; set; } + public uint Unknown717 { get; set; } + public uint Unknown718 { get; set; } + public uint Unknown719 { get; set; } + public uint Unknown720 { get; set; } + public uint Unknown721 { get; set; } + public uint Unknown722 { get; set; } + public uint Unknown723 { get; set; } + public uint Unknown724 { get; set; } + public uint Unknown725 { get; set; } + public uint Unknown726 { get; set; } + public uint Unknown727 { get; set; } + public uint Unknown728 { get; set; } + public uint Unknown729 { get; set; } + public uint Unknown730 { get; set; } + public uint Unknown731 { get; set; } + public uint Unknown732 { get; set; } + public uint Unknown733 { get; set; } + public uint Unknown734 { get; set; } + public uint Unknown735 { get; set; } + public uint Unknown736 { get; set; } + public uint Unknown737 { get; set; } + public uint Unknown738 { get; set; } + public uint Unknown739 { get; set; } + public uint Unknown740 { get; set; } + public uint Unknown741 { get; set; } + public uint Unknown742 { get; set; } + public uint Unknown743 { get; set; } + public uint Unknown744 { get; set; } + public uint Unknown745 { get; set; } + public uint Unknown746 { get; set; } + public uint Unknown747 { get; set; } + public uint Unknown748 { get; set; } + public uint Unknown749 { get; set; } + public uint Unknown750 { get; set; } + public uint Unknown751 { get; set; } + public uint Unknown752 { get; set; } + public uint Unknown753 { get; set; } + public uint Unknown754 { get; set; } + public uint Unknown755 { get; set; } + public uint Unknown756 { get; set; } + public uint Unknown757 { get; set; } + public uint Unknown758 { get; set; } + public uint Unknown759 { get; set; } + public uint Unknown760 { get; set; } + public uint Unknown761 { get; set; } + public uint Unknown762 { get; set; } + public uint Unknown763 { get; set; } + public uint Unknown764 { get; set; } + public uint Unknown765 { get; set; } + public uint Unknown766 { get; set; } + public uint Unknown767 { get; set; } + public uint Unknown768 { get; set; } + public uint Unknown769 { get; set; } + public uint Unknown770 { get; set; } + public uint Unknown771 { get; set; } + public uint Unknown772 { get; set; } + public uint Unknown773 { get; set; } + public uint Unknown774 { get; set; } + public uint Unknown775 { get; set; } + public uint Unknown776 { get; set; } + public uint Unknown777 { get; set; } + public uint Unknown778 { get; set; } + public uint Unknown779 { get; set; } + public uint Unknown780 { get; set; } + public uint Unknown781 { get; set; } + public uint Unknown782 { get; set; } + public uint Unknown783 { get; set; } + public uint Unknown784 { get; set; } + public uint Unknown785 { get; set; } + public uint Unknown786 { get; set; } + public uint Unknown787 { get; set; } + public uint Unknown788 { get; set; } + public uint Unknown789 { get; set; } + public uint Unknown790 { get; set; } + public uint Unknown791 { get; set; } + public uint Unknown792 { get; set; } + public uint Unknown793 { get; set; } + public uint Unknown794 { get; set; } + public uint Unknown795 { get; set; } + public uint Unknown796 { get; set; } + public uint Unknown797 { get; set; } + public uint Unknown798 { get; set; } + public uint Unknown799 { get; set; } + public uint Unknown800 { get; set; } + public uint Unknown801 { get; set; } + public uint Unknown802 { get; set; } + public uint Unknown803 { get; set; } + public uint Unknown804 { get; set; } + public uint Unknown805 { get; set; } + public uint Unknown806 { get; set; } + public uint Unknown807 { get; set; } + public uint Unknown808 { get; set; } + public uint Unknown809 { get; set; } + public uint Unknown810 { get; set; } + public uint Unknown811 { get; set; } + public uint Unknown812 { get; set; } + public uint Unknown813 { get; set; } + public uint Unknown814 { get; set; } + public uint Unknown815 { get; set; } + public uint Unknown816 { get; set; } + public uint Unknown817 { get; set; } + public uint Unknown818 { get; set; } + public uint Unknown819 { get; set; } + public uint Unknown820 { get; set; } + public uint Unknown821 { get; set; } + public uint Unknown822 { get; set; } + public uint Unknown823 { get; set; } + public uint Unknown824 { get; set; } + public uint Unknown825 { get; set; } + public uint Unknown826 { get; set; } + public uint Unknown827 { get; set; } + public uint Unknown828 { get; set; } + public uint Unknown829 { get; set; } + public uint Unknown830 { get; set; } + public uint Unknown831 { get; set; } + public uint Unknown832 { get; set; } + public uint Unknown833 { get; set; } + public uint Unknown834 { get; set; } + public uint Unknown835 { get; set; } + public uint Unknown836 { get; set; } + public uint Unknown837 { get; set; } + public uint Unknown838 { get; set; } + public uint Unknown839 { get; set; } + public uint Unknown840 { get; set; } + public uint Unknown841 { get; set; } + public uint Unknown842 { get; set; } + public uint Unknown843 { get; set; } + public uint Unknown844 { get; set; } + public uint Unknown845 { get; set; } + public uint Unknown846 { get; set; } + public uint Unknown847 { get; set; } + public uint Unknown848 { get; set; } + public uint Unknown849 { get; set; } + public uint Unknown850 { get; set; } + public uint Unknown851 { get; set; } + public uint Unknown852 { get; set; } + public uint Unknown853 { get; set; } + public uint Unknown854 { get; set; } + public uint Unknown855 { get; set; } + public uint Unknown856 { get; set; } + public uint Unknown857 { get; set; } + public uint Unknown858 { get; set; } + public uint Unknown859 { get; set; } + public uint Unknown860 { get; set; } + public uint Unknown861 { get; set; } + public uint Unknown862 { get; set; } + public uint Unknown863 { get; set; } + public uint Unknown864 { get; set; } + public uint Unknown865 { get; set; } + public uint Unknown866 { get; set; } + public uint Unknown867 { get; set; } + public uint Unknown868 { get; set; } + public uint Unknown869 { get; set; } + public uint Unknown870 { get; set; } + public uint Unknown871 { get; set; } + public uint Unknown872 { get; set; } + public uint Unknown873 { get; set; } + public uint Unknown874 { get; set; } + public uint Unknown875 { get; set; } + public uint Unknown876 { get; set; } + public uint Unknown877 { get; set; } + public uint Unknown878 { get; set; } + public uint Unknown879 { get; set; } + public uint Unknown880 { get; set; } + public uint Unknown881 { get; set; } + public uint Unknown882 { get; set; } + public uint Unknown883 { get; set; } + public uint Unknown884 { get; set; } + public uint Unknown885 { get; set; } + public uint Unknown886 { get; set; } + public uint Unknown887 { get; set; } + public uint Unknown888 { get; set; } + public uint Unknown889 { get; set; } + public uint Unknown890 { get; set; } + public uint Unknown891 { get; set; } + public uint Unknown892 { get; set; } + public uint Unknown893 { get; set; } + public uint Unknown894 { get; set; } + public uint Unknown895 { get; set; } + public uint Unknown896 { get; set; } + public uint Unknown897 { get; set; } + public uint Unknown898 { get; set; } + public uint Unknown899 { get; set; } + public uint Unknown900 { get; set; } + public uint Unknown901 { get; set; } + public uint Unknown902 { get; set; } + public uint Unknown903 { get; set; } + public uint Unknown904 { get; set; } + public uint Unknown905 { get; set; } + public uint Unknown906 { get; set; } + public uint Unknown907 { get; set; } + public uint Unknown908 { get; set; } + public uint Unknown909 { get; set; } + public uint Unknown910 { get; set; } + public uint Unknown911 { get; set; } + public uint Unknown912 { get; set; } + public uint Unknown913 { get; set; } + public uint Unknown914 { get; set; } + public uint Unknown915 { get; set; } + public uint Unknown916 { get; set; } + public uint Unknown917 { get; set; } + public uint Unknown918 { get; set; } + public uint Unknown919 { get; set; } + public uint Unknown920 { get; set; } + public uint Unknown921 { get; set; } + public uint Unknown922 { get; set; } + public uint Unknown923 { get; set; } + public uint Unknown924 { get; set; } + public uint Unknown925 { get; set; } + public uint Unknown926 { get; set; } + public uint Unknown927 { get; set; } + public uint Unknown928 { get; set; } + public uint Unknown929 { get; set; } + public uint Unknown930 { get; set; } + public uint Unknown931 { get; set; } + public uint Unknown932 { get; set; } + public uint Unknown933 { get; set; } + public uint Unknown934 { get; set; } + public uint Unknown935 { get; set; } + public uint Unknown936 { get; set; } + public uint Unknown937 { get; set; } + public uint Unknown938 { get; set; } + public uint Unknown939 { get; set; } + public uint Unknown940 { get; set; } + public uint Unknown941 { get; set; } + public uint Unknown942 { get; set; } + public uint Unknown943 { get; set; } + public uint Unknown944 { get; set; } + public uint Unknown945 { get; set; } + public uint Unknown946 { get; set; } + public uint Unknown947 { get; set; } + public uint Unknown948 { get; set; } + public uint Unknown949 { get; set; } + public uint Unknown950 { get; set; } + public uint Unknown951 { get; set; } + public uint Unknown952 { get; set; } + public uint Unknown953 { get; set; } + public uint Unknown954 { get; set; } + public uint Unknown955 { get; set; } + public uint Unknown956 { get; set; } + public uint Unknown957 { get; set; } + public uint Unknown958 { get; set; } + public uint Unknown959 { get; set; } + public uint Unknown960 { get; set; } + public uint Unknown961 { get; set; } + public uint Unknown962 { get; set; } + public uint Unknown963 { get; set; } + public uint Unknown964 { get; set; } + public uint Unknown965 { get; set; } + public uint Unknown966 { get; set; } + public uint Unknown967 { get; set; } + public uint Unknown968 { get; set; } + public uint Unknown969 { get; set; } + public uint Unknown970 { get; set; } + public uint Unknown971 { get; set; } + public uint Unknown972 { get; set; } + public uint Unknown973 { get; set; } + public uint Unknown974 { get; set; } + public uint Unknown975 { get; set; } + public uint Unknown976 { get; set; } + public uint Unknown977 { get; set; } + public uint Unknown978 { get; set; } + public uint Unknown979 { get; set; } + public uint Unknown980 { get; set; } + public uint Unknown981 { get; set; } + public uint Unknown982 { get; set; } + public uint Unknown983 { get; set; } + public uint Unknown984 { get; set; } + public uint Unknown985 { get; set; } + public uint Unknown986 { get; set; } + public uint Unknown987 { get; set; } + public uint Unknown988 { get; set; } + public uint Unknown989 { get; set; } + public uint Unknown990 { get; set; } + public uint Unknown991 { get; set; } + public uint Unknown992 { get; set; } + public uint Unknown993 { get; set; } + public uint Unknown994 { get; set; } + public uint Unknown995 { get; set; } + public uint Unknown996 { get; set; } + public uint Unknown997 { get; set; } + public uint Unknown998 { get; set; } + public uint Unknown999 { get; set; } + public uint Unknown1000 { get; set; } + public uint Unknown1001 { get; set; } + public uint Unknown1002 { get; set; } + public uint Unknown1003 { get; set; } + public uint Unknown1004 { get; set; } + public uint Unknown1005 { get; set; } + public uint Unknown1006 { get; set; } + public uint Unknown1007 { get; set; } + public uint Unknown1008 { get; set; } + public uint Unknown1009 { get; set; } + public uint Unknown1010 { get; set; } + public uint Unknown1011 { get; set; } + public uint Unknown1012 { get; set; } + public uint Unknown1013 { get; set; } + public uint Unknown1014 { get; set; } + public uint Unknown1015 { get; set; } + public uint Unknown1016 { get; set; } + public uint Unknown1017 { get; set; } + public uint Unknown1018 { get; set; } + public uint Unknown1019 { get; set; } + public uint Unknown1020 { get; set; } + public uint Unknown1021 { get; set; } + public uint Unknown1022 { get; set; } + public uint Unknown1023 { get; set; } + public uint Unknown1024 { get; set; } + public uint Unknown1025 { get; set; } + public uint Unknown1026 { get; set; } + public uint Unknown1027 { get; set; } + public uint Unknown1028 { get; set; } + public uint Unknown1029 { get; set; } + public uint Unknown1030 { get; set; } + public uint Unknown1031 { get; set; } + public uint Unknown1032 { get; set; } + public uint Unknown1033 { get; set; } + public uint Unknown1034 { get; set; } + public uint Unknown1035 { get; set; } + public uint Unknown1036 { get; set; } + public uint Unknown1037 { get; set; } + public uint Unknown1038 { get; set; } + public uint Unknown1039 { get; set; } + public uint Unknown1040 { get; set; } + public uint Unknown1041 { get; set; } + public uint Unknown1042 { get; set; } + public uint Unknown1043 { get; set; } + public uint Unknown1044 { get; set; } + public uint Unknown1045 { get; set; } + public uint Unknown1046 { get; set; } + public uint Unknown1047 { get; set; } + public uint Unknown1048 { get; set; } + public uint Unknown1049 { get; set; } + public uint Unknown1050 { get; set; } + public uint Unknown1051 { get; set; } + public uint Unknown1052 { get; set; } + public uint Unknown1053 { get; set; } + public uint Unknown1054 { get; set; } + public uint Unknown1055 { get; set; } + public uint Unknown1056 { get; set; } + public uint Unknown1057 { get; set; } + public uint Unknown1058 { get; set; } + public uint Unknown1059 { get; set; } + public uint Unknown1060 { get; set; } + public uint Unknown1061 { get; set; } + public uint Unknown1062 { get; set; } + public uint Unknown1063 { get; set; } + public uint Unknown1064 { get; set; } + public uint Unknown1065 { get; set; } + public uint Unknown1066 { get; set; } + public uint Unknown1067 { get; set; } + public uint Unknown1068 { get; set; } + public uint Unknown1069 { get; set; } + public uint Unknown1070 { get; set; } + public uint Unknown1071 { get; set; } + public uint Unknown1072 { get; set; } + public uint Unknown1073 { get; set; } + public uint Unknown1074 { get; set; } + public uint Unknown1075 { get; set; } + public uint Unknown1076 { get; set; } + public uint Unknown1077 { get; set; } + public uint Unknown1078 { get; set; } + public uint Unknown1079 { get; set; } + public uint Unknown1080 { get; set; } + public uint Unknown1081 { get; set; } + public uint Unknown1082 { get; set; } + public uint Unknown1083 { get; set; } + public uint Unknown1084 { get; set; } + public uint Unknown1085 { get; set; } + public uint Unknown1086 { get; set; } + public uint Unknown1087 { get; set; } + public uint Unknown1088 { get; set; } + public uint Unknown1089 { get; set; } + public uint Unknown1090 { get; set; } + public uint Unknown1091 { get; set; } + public uint Unknown1092 { get; set; } + public uint Unknown1093 { get; set; } + public uint Unknown1094 { get; set; } + public uint Unknown1095 { get; set; } + public uint Unknown1096 { get; set; } + public uint Unknown1097 { get; set; } + public uint Unknown1098 { get; set; } + public uint Unknown1099 { get; set; } + public uint Unknown1100 { get; set; } + public uint Unknown1101 { get; set; } + public uint Unknown1102 { get; set; } + public uint Unknown1103 { get; set; } + public uint Unknown1104 { get; set; } + public uint Unknown1105 { get; set; } + public uint Unknown1106 { get; set; } + public uint Unknown1107 { get; set; } + public uint Unknown1108 { get; set; } + public uint Unknown1109 { get; set; } + public uint Unknown1110 { get; set; } + public uint Unknown1111 { get; set; } + public uint Unknown1112 { get; set; } + public uint Unknown1113 { get; set; } + public uint Unknown1114 { get; set; } + public uint Unknown1115 { get; set; } + public uint Unknown1116 { get; set; } + public uint Unknown1117 { get; set; } + public uint Unknown1118 { get; set; } + public uint Unknown1119 { get; set; } + public uint Unknown1120 { get; set; } + public uint Unknown1121 { get; set; } + public uint Unknown1122 { get; set; } + public uint Unknown1123 { get; set; } + public uint Unknown1124 { get; set; } + public uint Unknown1125 { get; set; } + public uint Unknown1126 { get; set; } + public uint Unknown1127 { get; set; } + public uint Unknown1128 { get; set; } + public uint Unknown1129 { get; set; } + public uint Unknown1130 { get; set; } + public uint Unknown1131 { get; set; } + public uint Unknown1132 { get; set; } + public uint Unknown1133 { get; set; } + public uint Unknown1134 { get; set; } + public uint Unknown1135 { get; set; } + public uint Unknown1136 { get; set; } + public uint Unknown1137 { get; set; } + public uint Unknown1138 { get; set; } + public uint Unknown1139 { get; set; } + public uint Unknown1140 { get; set; } + public uint Unknown1141 { get; set; } + public uint Unknown1142 { get; set; } + public uint Unknown1143 { get; set; } + public uint Unknown1144 { get; set; } + public uint Unknown1145 { get; set; } + public uint Unknown1146 { get; set; } + public uint Unknown1147 { get; set; } + public uint Unknown1148 { get; set; } + public uint Unknown1149 { get; set; } + public uint Unknown1150 { get; set; } + public uint Unknown1151 { get; set; } + public uint Unknown1152 { get; set; } + public uint Unknown1153 { get; set; } + public uint Unknown1154 { get; set; } + public uint Unknown1155 { get; set; } + public uint Unknown1156 { get; set; } + public uint Unknown1157 { get; set; } + public uint Unknown1158 { get; set; } + public uint Unknown1159 { get; set; } + public uint Unknown1160 { get; set; } + public uint Unknown1161 { get; set; } + public uint Unknown1162 { get; set; } + public uint Unknown1163 { get; set; } + public uint Unknown1164 { get; set; } + public uint Unknown1165 { get; set; } + public uint Unknown1166 { get; set; } + public uint Unknown1167 { get; set; } + public uint Unknown1168 { get; set; } + public uint Unknown1169 { get; set; } + public uint Unknown1170 { get; set; } + public uint Unknown1171 { get; set; } + public uint Unknown1172 { get; set; } + public uint Unknown1173 { get; set; } + public uint Unknown1174 { get; set; } + public uint Unknown1175 { get; set; } + public uint Unknown1176 { get; set; } + public uint Unknown1177 { get; set; } + public uint Unknown1178 { get; set; } + public uint Unknown1179 { get; set; } + public uint Unknown1180 { get; set; } + public uint Unknown1181 { get; set; } + public uint Unknown1182 { get; set; } + public uint Unknown1183 { get; set; } + public uint Unknown1184 { get; set; } + public uint Unknown1185 { get; set; } + public uint Unknown1186 { get; set; } + public uint Unknown1187 { get; set; } + public uint Unknown1188 { get; set; } + public uint Unknown1189 { get; set; } + public uint Unknown1190 { get; set; } + public uint Unknown1191 { get; set; } + public uint Unknown1192 { get; set; } + public uint Unknown1193 { get; set; } + public uint Unknown1194 { get; set; } + public uint Unknown1195 { get; set; } + public uint Unknown1196 { get; set; } + public uint Unknown1197 { get; set; } + public uint Unknown1198 { get; set; } + public uint Unknown1199 { get; set; } + public uint Unknown1200 { get; set; } + public uint Unknown1201 { get; set; } + public uint Unknown1202 { get; set; } + public uint Unknown1203 { get; set; } + public uint Unknown1204 { get; set; } + public uint Unknown1205 { get; set; } + public uint Unknown1206 { get; set; } + public uint Unknown1207 { get; set; } + public uint Unknown1208 { get; set; } + public uint Unknown1209 { get; set; } + public uint Unknown1210 { get; set; } + public uint Unknown1211 { get; set; } + public uint Unknown1212 { get; set; } + public uint Unknown1213 { get; set; } + public uint Unknown1214 { get; set; } + public uint Unknown1215 { get; set; } + public uint Unknown1216 { get; set; } + public uint Unknown1217 { get; set; } + public uint Unknown1218 { get; set; } + public uint Unknown1219 { get; set; } + public uint Unknown1220 { get; set; } + public uint Unknown1221 { get; set; } + public uint Unknown1222 { get; set; } + public uint Unknown1223 { get; set; } + public uint Unknown1224 { get; set; } + public uint Unknown1225 { get; set; } + public uint Unknown1226 { get; set; } + public uint Unknown1227 { get; set; } + public uint Unknown1228 { get; set; } + public uint Unknown1229 { get; set; } + public uint Unknown1230 { get; set; } + public uint Unknown1231 { get; set; } + public uint Unknown1232 { get; set; } + public uint Unknown1233 { get; set; } + public uint Unknown1234 { get; set; } + public uint Unknown1235 { get; set; } + public uint Unknown1236 { get; set; } + public uint Unknown1237 { get; set; } + public uint Unknown1238 { get; set; } + public uint Unknown1239 { get; set; } + public uint Unknown1240 { get; set; } + public uint Unknown1241 { get; set; } + public uint Unknown1242 { get; set; } + public uint Unknown1243 { get; set; } + public uint Unknown1244 { get; set; } + public uint Unknown1245 { get; set; } + public uint Unknown1246 { get; set; } + public uint Unknown1247 { get; set; } + public uint Unknown1248 { get; set; } + public uint Unknown1249 { get; set; } + public uint Unknown1250 { get; set; } + public uint Unknown1251 { get; set; } + public uint Unknown1252 { get; set; } + public uint Unknown1253 { get; set; } + public uint Unknown1254 { get; set; } + public uint Unknown1255 { get; set; } + public uint Unknown1256 { get; set; } + public uint Unknown1257 { get; set; } + public uint Unknown1258 { get; set; } + public uint Unknown1259 { get; set; } + public uint Unknown1260 { get; set; } + public uint Unknown1261 { get; set; } + public uint Unknown1262 { get; set; } + public uint Unknown1263 { get; set; } + public uint Unknown1264 { get; set; } + public uint Unknown1265 { get; set; } + public uint Unknown1266 { get; set; } + public uint Unknown1267 { get; set; } + public uint Unknown1268 { get; set; } + public uint Unknown1269 { get; set; } + public uint Unknown1270 { get; set; } + public uint Unknown1271 { get; set; } + public uint Unknown1272 { get; set; } + public uint Unknown1273 { get; set; } + public uint Unknown1274 { get; set; } + public uint Unknown1275 { get; set; } + public uint Unknown1276 { get; set; } + public uint Unknown1277 { get; set; } + public uint Unknown1278 { get; set; } + public uint Unknown1279 { get; set; } + public uint Unknown1280 { get; set; } + public uint Unknown1281 { get; set; } + public uint Unknown1282 { get; set; } + public uint Unknown1283 { get; set; } + public uint Unknown1284 { get; set; } + public uint Unknown1285 { get; set; } + public uint Unknown1286 { get; set; } + public uint Unknown1287 { get; set; } + public uint Unknown1288 { get; set; } + public uint Unknown1289 { get; set; } + public uint Unknown1290 { get; set; } + public uint Unknown1291 { get; set; } + public uint Unknown1292 { get; set; } + public uint Unknown1293 { get; set; } + public uint Unknown1294 { get; set; } + public uint Unknown1295 { get; set; } + public uint Unknown1296 { get; set; } + public uint Unknown1297 { get; set; } + public uint Unknown1298 { get; set; } + public uint Unknown1299 { get; set; } + public uint Unknown1300 { get; set; } + public uint Unknown1301 { get; set; } + public uint Unknown1302 { get; set; } + public uint Unknown1303 { get; set; } + public uint Unknown1304 { get; set; } + public uint Unknown1305 { get; set; } + public uint Unknown1306 { get; set; } + public uint Unknown1307 { get; set; } + public uint Unknown1308 { get; set; } + public uint Unknown1309 { get; set; } + public uint Unknown1310 { get; set; } + public uint Unknown1311 { get; set; } + public uint Unknown1312 { get; set; } + public uint Unknown1313 { get; set; } + public uint Unknown1314 { get; set; } + public uint Unknown1315 { get; set; } + public uint Unknown1316 { get; set; } + public uint Unknown1317 { get; set; } + public uint Unknown1318 { get; set; } + public uint Unknown1319 { get; set; } + public uint Unknown1320 { get; set; } + public uint Unknown1321 { get; set; } + public uint Unknown1322 { get; set; } + public uint Unknown1323 { get; set; } + public uint Unknown1324 { get; set; } + public uint Unknown1325 { get; set; } + public uint Unknown1326 { get; set; } + public uint Unknown1327 { get; set; } + public uint Unknown1328 { get; set; } + public uint Unknown1329 { get; set; } + public uint Unknown1330 { get; set; } + public uint Unknown1331 { get; set; } + public uint Unknown1332 { get; set; } + public uint Unknown1333 { get; set; } + public uint Unknown1334 { get; set; } + public uint Unknown1335 { get; set; } + public uint Unknown1336 { get; set; } + public uint Unknown1337 { get; set; } + public uint Unknown1338 { get; set; } + public uint Unknown1339 { get; set; } + public uint Unknown1340 { get; set; } + public uint Unknown1341 { get; set; } + public uint Unknown1342 { get; set; } + public uint Unknown1343 { get; set; } + public uint Unknown1344 { get; set; } + public uint Unknown1345 { get; set; } + public uint Unknown1346 { get; set; } + public uint Unknown1347 { get; set; } + public uint Unknown1348 { get; set; } + public uint Unknown1349 { get; set; } + public uint Unknown1350 { get; set; } + public uint Unknown1351 { get; set; } + public uint Unknown1352 { get; set; } + public uint Unknown1353 { get; set; } + public uint Unknown1354 { get; set; } + public uint Unknown1355 { get; set; } + public uint Unknown1356 { get; set; } + public uint Unknown1357 { get; set; } + public uint Unknown1358 { get; set; } + public uint Unknown1359 { get; set; } + public uint Unknown1360 { get; set; } + public uint Unknown1361 { get; set; } + public uint Unknown1362 { get; set; } + public uint Unknown1363 { get; set; } + public uint Unknown1364 { get; set; } + public uint Unknown1365 { get; set; } + public uint Unknown1366 { get; set; } + public uint Unknown1367 { get; set; } + public uint Unknown1368 { get; set; } + public uint Unknown1369 { get; set; } + public uint Unknown1370 { get; set; } + public uint Unknown1371 { get; set; } + public uint Unknown1372 { get; set; } + public uint Unknown1373 { get; set; } + public uint Unknown1374 { get; set; } + public uint Unknown1375 { get; set; } + public uint Unknown1376 { get; set; } + public uint Unknown1377 { get; set; } + public uint Unknown1378 { get; set; } + public uint Unknown1379 { get; set; } + public uint Unknown1380 { get; set; } + public uint Unknown1381 { get; set; } + public uint Unknown1382 { get; set; } + public uint Unknown1383 { get; set; } + public uint Unknown1384 { get; set; } + public uint Unknown1385 { get; set; } + public uint Unknown1386 { get; set; } + public uint Unknown1387 { get; set; } + public uint Unknown1388 { get; set; } + public uint Unknown1389 { get; set; } + public uint Unknown1390 { get; set; } + public uint Unknown1391 { get; set; } + public uint Unknown1392 { get; set; } + public uint Unknown1393 { get; set; } + public uint Unknown1394 { get; set; } + public uint Unknown1395 { get; set; } + public uint Unknown1396 { get; set; } + public uint Unknown1397 { get; set; } + public uint Unknown1398 { get; set; } + public uint Unknown1399 { get; set; } + public uint Unknown1400 { get; set; } + public uint Unknown1401 { get; set; } + public uint Unknown1402 { get; set; } + public uint Unknown1403 { get; set; } + public uint Unknown1404 { get; set; } + public uint Unknown1405 { get; set; } + public uint Unknown1406 { get; set; } + public uint Unknown1407 { get; set; } + public uint Unknown1408 { get; set; } + public uint Unknown1409 { get; set; } + public uint Unknown1410 { get; set; } + public uint Unknown1411 { get; set; } + public uint Unknown1412 { get; set; } + public uint Unknown1413 { get; set; } + public uint Unknown1414 { get; set; } + public uint Unknown1415 { get; set; } + public uint Unknown1416 { get; set; } + public uint Unknown1417 { get; set; } + public uint Unknown1418 { get; set; } + public uint Unknown1419 { get; set; } + public uint Unknown1420 { get; set; } + public uint Unknown1421 { get; set; } + public uint Unknown1422 { get; set; } + public uint Unknown1423 { get; set; } + public uint Unknown1424 { get; set; } + public uint Unknown1425 { get; set; } + public uint Unknown1426 { get; set; } + public uint Unknown1427 { get; set; } + public uint Unknown1428 { get; set; } + public uint Unknown1429 { get; set; } + public uint Unknown1430 { get; set; } + public uint Unknown1431 { get; set; } + public uint Unknown1432 { get; set; } + public uint Unknown1433 { get; set; } + public uint Unknown1434 { get; set; } + public uint Unknown1435 { get; set; } + public uint Unknown1436 { get; set; } + public uint Unknown1437 { get; set; } + public uint Unknown1438 { get; set; } + public uint Unknown1439 { get; set; } + public uint Unknown1440 { get; set; } + public uint Unknown1441 { get; set; } + public uint Unknown1442 { get; set; } + public uint Unknown1443 { get; set; } + public uint Unknown1444 { get; set; } + public uint Unknown1445 { get; set; } + public uint Unknown1446 { get; set; } + public uint Unknown1447 { get; set; } + public uint Unknown1448 { get; set; } + public uint Unknown1449 { get; set; } + public uint Unknown1450 { get; set; } + public uint Unknown1451 { get; set; } + public uint Unknown1452 { get; set; } + public uint Unknown1453 { get; set; } + public uint Unknown1454 { get; set; } + public uint Unknown1455 { get; set; } + public uint Unknown1456 { get; set; } + public uint Unknown1457 { get; set; } + public uint Unknown1458 { get; set; } + public uint Unknown1459 { get; set; } + public uint Unknown1460 { get; set; } + public uint Unknown1461 { get; set; } + public uint Unknown1462 { get; set; } + public uint Unknown1463 { get; set; } + public uint Unknown1464 { get; set; } + public uint Unknown1465 { get; set; } + public uint Unknown1466 { get; set; } + public uint Unknown1467 { get; set; } + public uint Unknown1468 { get; set; } + public uint Unknown1469 { get; set; } + public uint Unknown1470 { get; set; } + public uint Unknown1471 { get; set; } + public uint Unknown1472 { get; set; } + public uint Unknown1473 { get; set; } + public uint Unknown1474 { get; set; } + public uint Unknown1475 { get; set; } + public uint Unknown1476 { get; set; } + public uint Unknown1477 { get; set; } + public uint Unknown1478 { get; set; } + public uint Unknown1479 { get; set; } + public uint Unknown1480 { get; set; } + public uint Unknown1481 { get; set; } + public uint Unknown1482 { get; set; } + public uint Unknown1483 { get; set; } + public uint Unknown1484 { get; set; } + public uint Unknown1485 { get; set; } + public uint Unknown1486 { get; set; } + public uint Unknown1487 { get; set; } + public uint Unknown1488 { get; set; } + public uint Unknown1489 { get; set; } + public uint Unknown1490 { get; set; } + public uint Unknown1491 { get; set; } + public uint Unknown1492 { get; set; } + public uint Unknown1493 { get; set; } + public uint Unknown1494 { get; set; } + public uint Unknown1495 { get; set; } + public uint Unknown1496 { get; set; } + public uint Unknown1497 { get; set; } + public uint Unknown1498 { get; set; } + public uint Unknown1499 { get; set; } + public uint Unknown1500 { get; set; } + public uint Unknown1501 { get; set; } + public uint Unknown1502 { get; set; } + public uint Unknown1503 { get; set; } + public uint Unknown1504 { get; set; } + public uint Unknown1505 { get; set; } + public uint Unknown1506 { get; set; } + public uint Unknown1507 { get; set; } + public uint Unknown1508 { get; set; } + public uint Unknown1509 { get; set; } + public uint Unknown1510 { get; set; } + public uint Unknown1511 { get; set; } + public uint Unknown1512 { get; set; } + public uint Unknown1513 { get; set; } + public uint Unknown1514 { get; set; } + public uint Unknown1515 { get; set; } + public uint Unknown1516 { get; set; } + public uint Unknown1517 { get; set; } + public uint Unknown1518 { get; set; } + public uint Unknown1519 { get; set; } + public uint Unknown1520 { get; set; } + public uint Unknown1521 { get; set; } + public uint Unknown1522 { get; set; } + public uint Unknown1523 { get; set; } + public uint Unknown1524 { get; set; } + public uint Unknown1525 { get; set; } + public uint Unknown1526 { get; set; } + public uint Unknown1527 { get; set; } + public uint Unknown1528 { get; set; } + public uint Unknown1529 { get; set; } + public uint Unknown1530 { get; set; } + public uint Unknown1531 { get; set; } + public uint Unknown1532 { get; set; } + public uint Unknown1533 { get; set; } + public uint Unknown1534 { get; set; } + public uint Unknown1535 { get; set; } + public uint Unknown1536 { get; set; } + public uint Unknown1537 { get; set; } + public uint Unknown1538 { get; set; } + public uint Unknown1539 { get; set; } + public uint Unknown1540 { get; set; } + public uint Unknown1541 { get; set; } + public uint Unknown1542 { get; set; } + public uint Unknown1543 { get; set; } + public uint Unknown1544 { get; set; } + public uint Unknown1545 { get; set; } + public uint Unknown1546 { get; set; } + public uint Unknown1547 { get; set; } + public uint Unknown1548 { get; set; } + public uint Unknown1549 { get; set; } + public uint Unknown1550 { get; set; } + public uint Unknown1551 { get; set; } + public uint Unknown1552 { get; set; } + public uint Unknown1553 { get; set; } + public uint Unknown1554 { get; set; } + public uint Unknown1555 { get; set; } + public uint Unknown1556 { get; set; } + public uint Unknown1557 { get; set; } + public uint Unknown1558 { get; set; } + public uint Unknown1559 { get; set; } + public uint Unknown1560 { get; set; } + public uint Unknown1561 { get; set; } + public uint Unknown1562 { get; set; } + public uint Unknown1563 { get; set; } + public uint Unknown1564 { get; set; } + public uint Unknown1565 { get; set; } + public uint Unknown1566 { get; set; } + public uint Unknown1567 { get; set; } + public uint Unknown1568 { get; set; } + public uint Unknown1569 { get; set; } + public uint Unknown1570 { get; set; } + public uint Unknown1571 { get; set; } + public uint Unknown1572 { get; set; } + public uint Unknown1573 { get; set; } + public uint Unknown1574 { get; set; } + public uint Unknown1575 { get; set; } + public uint Unknown1576 { get; set; } + public uint Unknown1577 { get; set; } + public uint Unknown1578 { get; set; } + public uint Unknown1579 { get; set; } + public uint Unknown1580 { get; set; } + public uint Unknown1581 { get; set; } + public uint Unknown1582 { get; set; } + public uint Unknown1583 { get; set; } + public uint Unknown1584 { get; set; } + public uint Unknown1585 { get; set; } + public uint Unknown1586 { get; set; } + public uint Unknown1587 { get; set; } + public uint Unknown1588 { get; set; } + public uint Unknown1589 { get; set; } + public uint Unknown1590 { get; set; } + public uint Unknown1591 { get; set; } + public uint Unknown1592 { get; set; } + public uint Unknown1593 { get; set; } + public uint Unknown1594 { get; set; } + public uint Unknown1595 { get; set; } + public uint Unknown1596 { get; set; } + public uint Unknown1597 { get; set; } + public uint Unknown1598 { get; set; } + public uint Unknown1599 { get; set; } + public uint Unknown1600 { get; set; } + public uint Unknown1601 { get; set; } + public uint Unknown1602 { get; set; } + public uint Unknown1603 { get; set; } + public uint Unknown1604 { get; set; } + public uint Unknown1605 { get; set; } + public uint Unknown1606 { get; set; } + public uint Unknown1607 { get; set; } + public uint Unknown1608 { get; set; } + public uint Unknown1609 { get; set; } + public uint Unknown1610 { get; set; } + public uint Unknown1611 { get; set; } + public uint Unknown1612 { get; set; } + public uint Unknown1613 { get; set; } + public uint Unknown1614 { get; set; } + public uint Unknown1615 { get; set; } + public uint Unknown1616 { get; set; } + public uint Unknown1617 { get; set; } + public uint Unknown1618 { get; set; } + public uint Unknown1619 { get; set; } + public uint Unknown1620 { get; set; } + public uint Unknown1621 { get; set; } + public uint Unknown1622 { get; set; } + public uint Unknown1623 { get; set; } + public uint Unknown1624 { get; set; } + public uint Unknown1625 { get; set; } + public uint Unknown1626 { get; set; } + public uint Unknown1627 { get; set; } + public uint Unknown1628 { get; set; } + public uint Unknown1629 { get; set; } + public uint Unknown1630 { get; set; } + public uint Unknown1631 { get; set; } + public uint Unknown1632 { get; set; } + public uint Unknown1633 { get; set; } + public uint Unknown1634 { get; set; } + public uint Unknown1635 { get; set; } + public uint Unknown1636 { get; set; } + public uint Unknown1637 { get; set; } + public uint Unknown1638 { get; set; } + public uint Unknown1639 { get; set; } + public uint Unknown1640 { get; set; } + public uint Unknown1641 { get; set; } + public uint Unknown1642 { get; set; } + public uint Unknown1643 { get; set; } + public uint Unknown1644 { get; set; } + public uint Unknown1645 { get; set; } + public uint Unknown1646 { get; set; } + public uint Unknown1647 { get; set; } + public uint Unknown1648 { get; set; } + public uint Unknown1649 { get; set; } + public uint Unknown1650 { get; set; } + public uint Unknown1651 { get; set; } + public uint Unknown1652 { get; set; } + public uint Unknown1653 { get; set; } + public uint Unknown1654 { get; set; } + public uint Unknown1655 { get; set; } + public uint Unknown1656 { get; set; } + public uint Unknown1657 { get; set; } + public uint Unknown1658 { get; set; } + public uint Unknown1659 { get; set; } + public uint Unknown1660 { get; set; } + public uint Unknown1661 { get; set; } + public uint Unknown1662 { get; set; } + public uint Unknown1663 { get; set; } + public uint Unknown1664 { get; set; } + public uint Unknown1665 { get; set; } + public uint Unknown1666 { get; set; } + public uint Unknown1667 { get; set; } + public uint Unknown1668 { get; set; } + public uint Unknown1669 { get; set; } + public uint Unknown1670 { get; set; } + public uint Unknown1671 { get; set; } + public uint Unknown1672 { get; set; } + public uint Unknown1673 { get; set; } + public uint Unknown1674 { get; set; } + public uint Unknown1675 { get; set; } + public uint Unknown1676 { get; set; } + public uint Unknown1677 { get; set; } + public uint Unknown1678 { get; set; } + public uint Unknown1679 { get; set; } + public uint Unknown1680 { get; set; } + public uint Unknown1681 { get; set; } + public uint Unknown1682 { get; set; } + public uint Unknown1683 { get; set; } + public uint Unknown1684 { get; set; } + public uint Unknown1685 { get; set; } + public uint Unknown1686 { get; set; } + public uint Unknown1687 { get; set; } + public uint Unknown1688 { get; set; } + public uint Unknown1689 { get; set; } + public uint Unknown1690 { get; set; } + public uint Unknown1691 { get; set; } + public uint Unknown1692 { get; set; } + public uint Unknown1693 { get; set; } + public uint Unknown1694 { get; set; } + public uint Unknown1695 { get; set; } + public uint Unknown1696 { get; set; } + public uint Unknown1697 { get; set; } + public uint Unknown1698 { get; set; } + public uint Unknown1699 { get; set; } + public uint Unknown1700 { get; set; } + public uint Unknown1701 { get; set; } + public uint Unknown1702 { get; set; } + public uint Unknown1703 { get; set; } + public uint Unknown1704 { get; set; } + public uint Unknown1705 { get; set; } + public uint Unknown1706 { get; set; } + public uint Unknown1707 { get; set; } + public uint Unknown1708 { get; set; } + public uint Unknown1709 { get; set; } + public uint Unknown1710 { get; set; } + public uint Unknown1711 { get; set; } + public uint Unknown1712 { get; set; } + public uint Unknown1713 { get; set; } + public uint Unknown1714 { get; set; } + public uint Unknown1715 { get; set; } + public uint Unknown1716 { get; set; } + public uint Unknown1717 { get; set; } + public uint Unknown1718 { get; set; } + public uint Unknown1719 { get; set; } + public uint Unknown1720 { get; set; } + public uint Unknown1721 { get; set; } + public uint Unknown1722 { get; set; } + public uint Unknown1723 { get; set; } + public uint Unknown1724 { get; set; } + public uint Unknown1725 { get; set; } + public uint Unknown1726 { get; set; } + public uint Unknown1727 { get; set; } + public uint Unknown1728 { get; set; } + public uint Unknown1729 { get; set; } + public uint Unknown1730 { get; set; } + public uint Unknown1731 { get; set; } + public uint Unknown1732 { get; set; } + public uint Unknown1733 { get; set; } + public uint Unknown1734 { get; set; } + public uint Unknown1735 { get; set; } + public uint Unknown1736 { get; set; } + public uint Unknown1737 { get; set; } + public uint Unknown1738 { get; set; } + public uint Unknown1739 { get; set; } + public uint Unknown1740 { get; set; } + public uint Unknown1741 { get; set; } + public uint Unknown1742 { get; set; } + public uint Unknown1743 { get; set; } + public uint Unknown1744 { get; set; } + public uint Unknown1745 { get; set; } + public uint Unknown1746 { get; set; } + public uint Unknown1747 { get; set; } + public uint Unknown1748 { get; set; } + public uint Unknown1749 { get; set; } + public uint Unknown1750 { get; set; } + public uint Unknown1751 { get; set; } + public uint Unknown1752 { get; set; } + public uint Unknown1753 { get; set; } + public uint Unknown1754 { get; set; } + public uint Unknown1755 { get; set; } + public uint Unknown1756 { get; set; } + public uint Unknown1757 { get; set; } + public uint Unknown1758 { get; set; } + public uint Unknown1759 { get; set; } + public uint Unknown1760 { get; set; } + public uint Unknown1761 { get; set; } + public uint Unknown1762 { get; set; } + public uint Unknown1763 { get; set; } + public uint Unknown1764 { get; set; } + public uint Unknown1765 { get; set; } + public uint Unknown1766 { get; set; } + public uint Unknown1767 { get; set; } + public uint Unknown1768 { get; set; } + public uint Unknown1769 { get; set; } + public uint Unknown1770 { get; set; } + public uint Unknown1771 { get; set; } + public uint Unknown1772 { get; set; } + public uint Unknown1773 { get; set; } + public uint Unknown1774 { get; set; } + public uint Unknown1775 { get; set; } + public uint Unknown1776 { get; set; } + public uint Unknown1777 { get; set; } + public uint Unknown1778 { get; set; } + public uint Unknown1779 { get; set; } + public uint Unknown1780 { get; set; } + public uint Unknown1781 { get; set; } + public uint Unknown1782 { get; set; } + public uint Unknown1783 { get; set; } + public uint Unknown1784 { get; set; } + public uint Unknown1785 { get; set; } + public uint Unknown1786 { get; set; } + public uint Unknown1787 { get; set; } + public uint Unknown1788 { get; set; } + public uint Unknown1789 { get; set; } + public uint Unknown1790 { get; set; } + public uint Unknown1791 { get; set; } + public uint Unknown1792 { get; set; } + public uint Unknown1793 { get; set; } + public uint Unknown1794 { get; set; } + public uint Unknown1795 { get; set; } + public uint Unknown1796 { get; set; } + public uint Unknown1797 { get; set; } + public uint Unknown1798 { get; set; } + public uint Unknown1799 { get; set; } + public uint Unknown1800 { get; set; } + public uint Unknown1801 { get; set; } + public uint Unknown1802 { get; set; } + public uint Unknown1803 { get; set; } + public uint Unknown1804 { get; set; } + public uint Unknown1805 { get; set; } + public uint Unknown1806 { get; set; } + public uint Unknown1807 { get; set; } + public uint Unknown1808 { get; set; } + public uint Unknown1809 { get; set; } + public uint Unknown1810 { get; set; } + public uint Unknown1811 { get; set; } + public uint Unknown1812 { get; set; } + public uint Unknown1813 { get; set; } + public uint Unknown1814 { get; set; } + public uint Unknown1815 { get; set; } + public uint Unknown1816 { get; set; } + public uint Unknown1817 { get; set; } + public uint Unknown1818 { get; set; } + public uint Unknown1819 { get; set; } + public uint Unknown1820 { get; set; } + public uint Unknown1821 { get; set; } + public uint Unknown1822 { get; set; } + public uint Unknown1823 { get; set; } + public uint Unknown1824 { get; set; } + public uint Unknown1825 { get; set; } + public uint Unknown1826 { get; set; } + public uint Unknown1827 { get; set; } + public uint Unknown1828 { get; set; } + public uint Unknown1829 { get; set; } + public uint Unknown1830 { get; set; } + public uint Unknown1831 { get; set; } + public uint Unknown1832 { get; set; } + public uint Unknown1833 { get; set; } + public uint Unknown1834 { get; set; } + public uint Unknown1835 { get; set; } + public uint Unknown1836 { get; set; } + public uint Unknown1837 { get; set; } + public uint Unknown1838 { get; set; } + public uint Unknown1839 { get; set; } + public uint Unknown1840 { get; set; } + public uint Unknown1841 { get; set; } + public uint Unknown1842 { get; set; } + public uint Unknown1843 { get; set; } + public uint Unknown1844 { get; set; } + public uint Unknown1845 { get; set; } + public uint Unknown1846 { get; set; } + public uint Unknown1847 { get; set; } + public uint Unknown1848 { get; set; } + public uint Unknown1849 { get; set; } + public uint Unknown1850 { get; set; } + public uint Unknown1851 { get; set; } + public uint Unknown1852 { get; set; } + public uint Unknown1853 { get; set; } + public uint Unknown1854 { get; set; } + public uint Unknown1855 { get; set; } + public uint Unknown1856 { get; set; } + public uint Unknown1857 { get; set; } + public uint Unknown1858 { get; set; } + public uint Unknown1859 { get; set; } + public uint Unknown1860 { get; set; } + public uint Unknown1861 { get; set; } + public uint Unknown1862 { get; set; } + public uint Unknown1863 { get; set; } + public uint Unknown1864 { get; set; } + public uint Unknown1865 { get; set; } + public uint Unknown1866 { get; set; } + public uint Unknown1867 { get; set; } + public uint Unknown1868 { get; set; } + public uint Unknown1869 { get; set; } + public uint Unknown1870 { get; set; } + public uint Unknown1871 { get; set; } + public uint Unknown1872 { get; set; } + public uint Unknown1873 { get; set; } + public uint Unknown1874 { get; set; } + public uint Unknown1875 { get; set; } + public uint Unknown1876 { get; set; } + public uint Unknown1877 { get; set; } + public uint Unknown1878 { get; set; } + public uint Unknown1879 { get; set; } + public uint Unknown1880 { get; set; } + public uint Unknown1881 { get; set; } + public uint Unknown1882 { get; set; } + public uint Unknown1883 { get; set; } + public uint Unknown1884 { get; set; } + public uint Unknown1885 { get; set; } + public uint Unknown1886 { get; set; } + public uint Unknown1887 { get; set; } + public uint Unknown1888 { get; set; } + public uint Unknown1889 { get; set; } + public uint Unknown1890 { get; set; } + public uint Unknown1891 { get; set; } + public uint Unknown1892 { get; set; } + public uint Unknown1893 { get; set; } + public uint Unknown1894 { get; set; } + public uint Unknown1895 { get; set; } + public uint Unknown1896 { get; set; } + public uint Unknown1897 { get; set; } + public uint Unknown1898 { get; set; } + public uint Unknown1899 { get; set; } + public uint Unknown1900 { get; set; } + public uint Unknown1901 { get; set; } + public uint Unknown1902 { get; set; } + public uint Unknown1903 { get; set; } + public uint Unknown1904 { get; set; } + public uint Unknown1905 { get; set; } + public uint Unknown1906 { get; set; } + public uint Unknown1907 { get; set; } + public uint Unknown1908 { get; set; } + public uint Unknown1909 { get; set; } + public uint Unknown1910 { get; set; } + public uint Unknown1911 { get; set; } + public uint Unknown1912 { get; set; } + public uint Unknown1913 { get; set; } + public uint Unknown1914 { get; set; } + public uint Unknown1915 { get; set; } + public uint Unknown1916 { get; set; } + public uint Unknown1917 { get; set; } + public uint Unknown1918 { get; set; } + public uint Unknown1919 { get; set; } + public uint Unknown1920 { get; set; } + public uint Unknown1921 { get; set; } + public uint Unknown1922 { get; set; } + public uint Unknown1923 { get; set; } + public uint Unknown1924 { get; set; } + public uint Unknown1925 { get; set; } + public uint Unknown1926 { get; set; } + public uint Unknown1927 { get; set; } + public uint Unknown1928 { get; set; } + public uint Unknown1929 { get; set; } + public uint Unknown1930 { get; set; } + public uint Unknown1931 { get; set; } + public uint Unknown1932 { get; set; } + public uint Unknown1933 { get; set; } + public uint Unknown1934 { get; set; } + public uint Unknown1935 { get; set; } + public uint Unknown1936 { get; set; } + public uint Unknown1937 { get; set; } + public uint Unknown1938 { get; set; } + public uint Unknown1939 { get; set; } + public uint Unknown1940 { get; set; } + public uint Unknown1941 { get; set; } + public uint Unknown1942 { get; set; } + public uint Unknown1943 { get; set; } + public uint Unknown1944 { get; set; } + public uint Unknown1945 { get; set; } + public uint Unknown1946 { get; set; } + public uint Unknown1947 { get; set; } + public uint Unknown1948 { get; set; } + public uint Unknown1949 { get; set; } + public uint Unknown1950 { get; set; } + public uint Unknown1951 { get; set; } + public uint Unknown1952 { get; set; } + public uint Unknown1953 { get; set; } + public uint Unknown1954 { get; set; } + public uint Unknown1955 { get; set; } + public uint Unknown1956 { get; set; } + public uint Unknown1957 { get; set; } + public uint Unknown1958 { get; set; } + public uint Unknown1959 { get; set; } + public uint Unknown1960 { get; set; } + public uint Unknown1961 { get; set; } + public uint Unknown1962 { get; set; } + public uint Unknown1963 { get; set; } + public uint Unknown1964 { get; set; } + public uint Unknown1965 { get; set; } + public uint Unknown1966 { get; set; } + public uint Unknown1967 { get; set; } + public uint Unknown1968 { get; set; } + public uint Unknown1969 { get; set; } + public uint Unknown1970 { get; set; } + public uint Unknown1971 { get; set; } + public uint Unknown1972 { get; set; } + public uint Unknown1973 { get; set; } + public uint Unknown1974 { get; set; } + public uint Unknown1975 { get; set; } + public uint Unknown1976 { get; set; } + public uint Unknown1977 { get; set; } + public uint Unknown1978 { get; set; } + public uint Unknown1979 { get; set; } + public uint Unknown1980 { get; set; } + public uint Unknown1981 { get; set; } + public uint Unknown1982 { get; set; } + public uint Unknown1983 { get; set; } + public uint Unknown1984 { get; set; } + public uint Unknown1985 { get; set; } + public uint Unknown1986 { get; set; } + public uint Unknown1987 { get; set; } + public uint Unknown1988 { get; set; } + public uint Unknown1989 { get; set; } + public uint Unknown1990 { get; set; } + public uint Unknown1991 { get; set; } + public uint Unknown1992 { get; set; } + public uint Unknown1993 { get; set; } + public uint Unknown1994 { get; set; } + public uint Unknown1995 { get; set; } + public uint Unknown1996 { get; set; } + public uint Unknown1997 { get; set; } + public uint Unknown1998 { get; set; } + public uint Unknown1999 { get; set; } + public uint Unknown2000 { get; set; } + public uint Unknown2001 { get; set; } + public uint Unknown2002 { get; set; } + public uint Unknown2003 { get; set; } + public uint Unknown2004 { get; set; } + public uint Unknown2005 { get; set; } + public uint Unknown2006 { get; set; } + public uint Unknown2007 { get; set; } + public uint Unknown2008 { get; set; } + public uint Unknown2009 { get; set; } + public uint Unknown2010 { get; set; } + public uint Unknown2011 { get; set; } + public uint Unknown2012 { get; set; } + public uint Unknown2013 { get; set; } + public uint Unknown2014 { get; set; } + public uint Unknown2015 { get; set; } + public uint Unknown2016 { get; set; } + public uint Unknown2017 { get; set; } + public uint Unknown2018 { get; set; } + public uint Unknown2019 { get; set; } + public uint Unknown2020 { get; set; } + public uint Unknown2021 { get; set; } + public uint Unknown2022 { get; set; } + public uint Unknown2023 { get; set; } + public uint Unknown2024 { get; set; } + public uint Unknown2025 { get; set; } + public uint Unknown2026 { get; set; } + public uint Unknown2027 { get; set; } + public uint Unknown2028 { get; set; } + public uint Unknown2029 { get; set; } + public uint Unknown2030 { get; set; } + public uint Unknown2031 { get; set; } + public uint Unknown2032 { get; set; } + public uint Unknown2033 { get; set; } + public uint Unknown2034 { get; set; } + public uint Unknown2035 { get; set; } + public uint Unknown2036 { get; set; } + public uint Unknown2037 { get; set; } + public uint Unknown2038 { get; set; } + public uint Unknown2039 { get; set; } + public uint Unknown2040 { get; set; } + public uint Unknown2041 { get; set; } + public uint Unknown2042 { get; set; } + public uint Unknown2043 { get; set; } + public uint Unknown2044 { get; set; } + public uint Unknown2045 { get; set; } + public uint Unknown2046 { get; set; } + public uint Unknown2047 { get; set; } + public uint Unknown2048 { get; set; } + public uint Unknown2049 { get; set; } + public uint Unknown2050 { get; set; } + public uint Unknown2051 { get; set; } + public uint Unknown2052 { get; set; } + public uint Unknown2053 { get; set; } + public uint Unknown2054 { get; set; } + public uint Unknown2055 { get; set; } + public uint Unknown2056 { get; set; } + public uint Unknown2057 { get; set; } + public uint Unknown2058 { get; set; } + public uint Unknown2059 { get; set; } + public uint Unknown2060 { get; set; } + public uint Unknown2061 { get; set; } + public uint Unknown2062 { get; set; } + public uint Unknown2063 { get; set; } + public uint Unknown2064 { get; set; } + public uint Unknown2065 { get; set; } + public uint Unknown2066 { get; set; } + public uint Unknown2067 { get; set; } + public uint Unknown2068 { get; set; } + public uint Unknown2069 { get; set; } + public uint Unknown2070 { get; set; } + public uint Unknown2071 { get; set; } + public uint Unknown2072 { get; set; } + public uint Unknown2073 { get; set; } + public uint Unknown2074 { get; set; } + public uint Unknown2075 { get; set; } + public uint Unknown2076 { get; set; } + public uint Unknown2077 { get; set; } + public uint Unknown2078 { get; set; } + public uint Unknown2079 { get; set; } + public uint Unknown2080 { get; set; } + public uint Unknown2081 { get; set; } + public uint Unknown2082 { get; set; } + public uint Unknown2083 { get; set; } + public uint Unknown2084 { get; set; } + public uint Unknown2085 { get; set; } + public uint Unknown2086 { get; set; } + public uint Unknown2087 { get; set; } + public uint Unknown2088 { get; set; } + public uint Unknown2089 { get; set; } + public uint Unknown2090 { get; set; } + public uint Unknown2091 { get; set; } + public uint Unknown2092 { get; set; } + public uint Unknown2093 { get; set; } + public uint Unknown2094 { get; set; } + public uint Unknown2095 { get; set; } + public uint Unknown2096 { get; set; } + public uint Unknown2097 { get; set; } + public uint Unknown2098 { get; set; } + public uint Unknown2099 { get; set; } + public uint Unknown2100 { get; set; } + public uint Unknown2101 { get; set; } + public uint Unknown2102 { get; set; } + public uint Unknown2103 { get; set; } + public uint Unknown2104 { get; set; } + public uint Unknown2105 { get; set; } + public uint Unknown2106 { get; set; } + public uint Unknown2107 { get; set; } + public uint Unknown2108 { get; set; } + public uint Unknown2109 { get; set; } + public uint Unknown2110 { get; set; } + public uint Unknown2111 { get; set; } + public uint Unknown2112 { get; set; } + public uint Unknown2113 { get; set; } + public uint Unknown2114 { get; set; } + public uint Unknown2115 { get; set; } + public uint Unknown2116 { get; set; } + public uint Unknown2117 { get; set; } + public uint Unknown2118 { get; set; } + public uint Unknown2119 { get; set; } + public uint Unknown2120 { get; set; } + public uint Unknown2121 { get; set; } + public uint Unknown2122 { get; set; } + public uint Unknown2123 { get; set; } + public uint Unknown2124 { get; set; } + public uint Unknown2125 { get; set; } + public uint Unknown2126 { get; set; } + public uint Unknown2127 { get; set; } + public uint Unknown2128 { get; set; } + public uint Unknown2129 { get; set; } + public uint Unknown2130 { get; set; } + public uint Unknown2131 { get; set; } + public uint Unknown2132 { get; set; } + public uint Unknown2133 { get; set; } + public uint Unknown2134 { get; set; } + public uint Unknown2135 { get; set; } + public uint Unknown2136 { get; set; } + public uint Unknown2137 { get; set; } + public uint Unknown2138 { get; set; } + public uint Unknown2139 { get; set; } + public uint Unknown2140 { get; set; } + public uint Unknown2141 { get; set; } + public uint Unknown2142 { get; set; } + public uint Unknown2143 { get; set; } + public uint Unknown2144 { get; set; } + public uint Unknown2145 { get; set; } + public uint Unknown2146 { get; set; } + public uint Unknown2147 { get; set; } + public uint Unknown2148 { get; set; } + public uint Unknown2149 { get; set; } + public uint Unknown2150 { get; set; } + public uint Unknown2151 { get; set; } + public uint Unknown2152 { get; set; } + public uint Unknown2153 { get; set; } + public uint Unknown2154 { get; set; } + public uint Unknown2155 { get; set; } + public uint Unknown2156 { get; set; } + public uint Unknown2157 { get; set; } + public uint Unknown2158 { get; set; } + public uint Unknown2159 { get; set; } + public uint Unknown2160 { get; set; } + public uint Unknown2161 { get; set; } + public uint Unknown2162 { get; set; } + public uint Unknown2163 { get; set; } + public uint Unknown2164 { get; set; } + public uint Unknown2165 { get; set; } + public uint Unknown2166 { get; set; } + public uint Unknown2167 { get; set; } + public uint Unknown2168 { get; set; } + public uint Unknown2169 { get; set; } + public uint Unknown2170 { get; set; } + public uint Unknown2171 { get; set; } + public uint Unknown2172 { get; set; } + public uint Unknown2173 { get; set; } + public uint Unknown2174 { get; set; } + public uint Unknown2175 { get; set; } + public uint Unknown2176 { get; set; } + public uint Unknown2177 { get; set; } + public uint Unknown2178 { get; set; } + public uint Unknown2179 { get; set; } + public uint Unknown2180 { get; set; } + public uint Unknown2181 { get; set; } + public uint Unknown2182 { get; set; } + public uint Unknown2183 { get; set; } + public uint Unknown2184 { get; set; } + public uint Unknown2185 { get; set; } + public uint Unknown2186 { get; set; } + public uint Unknown2187 { get; set; } + public uint Unknown2188 { get; set; } + public uint Unknown2189 { get; set; } + public uint Unknown2190 { get; set; } + public uint Unknown2191 { get; set; } + public uint Unknown2192 { get; set; } + public uint Unknown2193 { get; set; } + public uint Unknown2194 { get; set; } + public uint Unknown2195 { get; set; } + public uint Unknown2196 { get; set; } + public uint Unknown2197 { get; set; } + public uint Unknown2198 { get; set; } + public uint Unknown2199 { get; set; } + public uint Unknown2200 { get; set; } + public uint Unknown2201 { get; set; } + public uint Unknown2202 { get; set; } + public uint Unknown2203 { get; set; } + public uint Unknown2204 { get; set; } + public uint Unknown2205 { get; set; } + public uint Unknown2206 { get; set; } + public uint Unknown2207 { get; set; } + public uint Unknown2208 { get; set; } + public uint Unknown2209 { get; set; } + public uint Unknown2210 { get; set; } + public uint Unknown2211 { get; set; } + public uint Unknown2212 { get; set; } + public uint Unknown2213 { get; set; } + public uint Unknown2214 { get; set; } + public uint Unknown2215 { get; set; } + public uint Unknown2216 { get; set; } + public uint Unknown2217 { get; set; } + public uint Unknown2218 { get; set; } + public uint Unknown2219 { get; set; } + public uint Unknown2220 { get; set; } + public uint Unknown2221 { get; set; } + public uint Unknown2222 { get; set; } + public uint Unknown2223 { get; set; } + public uint Unknown2224 { get; set; } + public uint Unknown2225 { get; set; } + public uint Unknown2226 { get; set; } + public uint Unknown2227 { get; set; } + public uint Unknown2228 { get; set; } + public uint Unknown2229 { get; set; } + public uint Unknown2230 { get; set; } + public uint Unknown2231 { get; set; } + public uint Unknown2232 { get; set; } + public uint Unknown2233 { get; set; } + public uint Unknown2234 { get; set; } + public uint Unknown2235 { get; set; } + public uint Unknown2236 { get; set; } + public uint Unknown2237 { get; set; } + public uint Unknown2238 { get; set; } + public uint Unknown2239 { get; set; } + public uint Unknown2240 { get; set; } + public uint Unknown2241 { get; set; } + public uint Unknown2242 { get; set; } + public uint Unknown2243 { get; set; } + public uint Unknown2244 { get; set; } + public uint Unknown2245 { get; set; } + public uint Unknown2246 { get; set; } + public uint Unknown2247 { get; set; } + public uint Unknown2248 { get; set; } + public uint Unknown2249 { get; set; } + public uint Unknown2250 { get; set; } + public uint Unknown2251 { get; set; } + public uint Unknown2252 { get; set; } + public uint Unknown2253 { get; set; } + public uint Unknown2254 { get; set; } + public uint Unknown2255 { get; set; } + public uint Unknown2256 { get; set; } + public uint Unknown2257 { get; set; } + public uint Unknown2258 { get; set; } + public uint Unknown2259 { get; set; } + public uint Unknown2260 { get; set; } + public uint Unknown2261 { get; set; } + public uint Unknown2262 { get; set; } + public uint Unknown2263 { get; set; } + public uint Unknown2264 { get; set; } + public uint Unknown2265 { get; set; } + public uint Unknown2266 { get; set; } + public uint Unknown2267 { get; set; } + public uint Unknown2268 { get; set; } + public uint Unknown2269 { get; set; } + public uint Unknown2270 { get; set; } + public uint Unknown2271 { get; set; } + public uint Unknown2272 { get; set; } + public uint Unknown2273 { get; set; } + public uint Unknown2274 { get; set; } + public uint Unknown2275 { get; set; } + public uint Unknown2276 { get; set; } + public uint Unknown2277 { get; set; } + public uint Unknown2278 { get; set; } + public uint Unknown2279 { get; set; } + public uint Unknown2280 { get; set; } + public uint Unknown2281 { get; set; } + public uint Unknown2282 { get; set; } + public uint Unknown2283 { get; set; } + public uint Unknown2284 { get; set; } + public uint Unknown2285 { get; set; } + public uint Unknown2286 { get; set; } + public uint Unknown2287 { get; set; } + public uint Unknown2288 { get; set; } + public uint Unknown2289 { get; set; } + public uint Unknown2290 { get; set; } + public uint Unknown2291 { get; set; } + public uint Unknown2292 { get; set; } + public uint Unknown2293 { get; set; } + public uint Unknown2294 { get; set; } + public uint Unknown2295 { get; set; } + public uint Unknown2296 { get; set; } + public uint Unknown2297 { get; set; } + public uint Unknown2298 { get; set; } + public uint Unknown2299 { get; set; } + public uint Unknown2300 { get; set; } + public uint Unknown2301 { get; set; } + public uint Unknown2302 { get; set; } + public uint Unknown2303 { get; set; } + public uint Unknown2304 { get; set; } + public uint Unknown2305 { get; set; } + public uint Unknown2306 { get; set; } + public uint Unknown2307 { get; set; } + public uint Unknown2308 { get; set; } + public uint Unknown2309 { get; set; } + public uint Unknown2310 { get; set; } + public uint Unknown2311 { get; set; } + public uint Unknown2312 { get; set; } + public uint Unknown2313 { get; set; } + public uint Unknown2314 { get; set; } + public uint Unknown2315 { get; set; } + public uint Unknown2316 { get; set; } + public uint Unknown2317 { get; set; } + public uint Unknown2318 { get; set; } + public uint Unknown2319 { get; set; } + public uint Unknown2320 { get; set; } + public uint Unknown2321 { get; set; } + public uint Unknown2322 { get; set; } + public uint Unknown2323 { get; set; } + public uint Unknown2324 { get; set; } + public uint Unknown2325 { get; set; } + public uint Unknown2326 { get; set; } + public uint Unknown2327 { get; set; } + public uint Unknown2328 { get; set; } + public uint Unknown2329 { get; set; } + public uint Unknown2330 { get; set; } + public uint Unknown2331 { get; set; } + public uint Unknown2332 { get; set; } + public uint Unknown2333 { get; set; } + public uint Unknown2334 { get; set; } + public uint Unknown2335 { get; set; } + public uint Unknown2336 { get; set; } + public uint Unknown2337 { get; set; } + public uint Unknown2338 { get; set; } + public uint Unknown2339 { get; set; } + public uint Unknown2340 { get; set; } + public uint Unknown2341 { get; set; } + public uint Unknown2342 { get; set; } + public uint Unknown2343 { get; set; } + public uint Unknown2344 { get; set; } + public uint Unknown2345 { get; set; } + public uint Unknown2346 { get; set; } + public uint Unknown2347 { get; set; } + public uint Unknown2348 { get; set; } + public uint Unknown2349 { get; set; } + public uint Unknown2350 { get; set; } + public uint Unknown2351 { get; set; } + public uint Unknown2352 { get; set; } + public uint Unknown2353 { get; set; } + public uint Unknown2354 { get; set; } + public uint Unknown2355 { get; set; } + public uint Unknown2356 { get; set; } + public uint Unknown2357 { get; set; } + public uint Unknown2358 { get; set; } + public uint Unknown2359 { get; set; } + public uint Unknown2360 { get; set; } + public uint Unknown2361 { get; set; } + public uint Unknown2362 { get; set; } + public uint Unknown2363 { get; set; } + public uint Unknown2364 { get; set; } + public uint Unknown2365 { get; set; } + public uint Unknown2366 { get; set; } + public uint Unknown2367 { get; set; } + public uint Unknown2368 { get; set; } + public uint Unknown2369 { get; set; } + public uint Unknown2370 { get; set; } + public uint Unknown2371 { get; set; } + public uint Unknown2372 { get; set; } + public uint Unknown2373 { get; set; } + public uint Unknown2374 { get; set; } + public uint Unknown2375 { get; set; } + public uint Unknown2376 { get; set; } + public uint Unknown2377 { get; set; } + public uint Unknown2378 { get; set; } + public uint Unknown2379 { get; set; } + public uint Unknown2380 { get; set; } + public uint Unknown2381 { get; set; } + public uint Unknown2382 { get; set; } + public uint Unknown2383 { get; set; } + public uint Unknown2384 { get; set; } + public uint Unknown2385 { get; set; } + public uint Unknown2386 { get; set; } + public uint Unknown2387 { get; set; } + public uint Unknown2388 { get; set; } + public uint Unknown2389 { get; set; } + public uint Unknown2390 { get; set; } + public uint Unknown2391 { get; set; } + public uint Unknown2392 { get; set; } + public uint Unknown2393 { get; set; } + public uint Unknown2394 { get; set; } + public uint Unknown2395 { get; set; } + public uint Unknown2396 { get; set; } + public uint Unknown2397 { get; set; } + public uint Unknown2398 { get; set; } + public uint Unknown2399 { get; set; } + public uint Unknown2400 { get; set; } + public uint Unknown2401 { get; set; } + public uint Unknown2402 { get; set; } + public uint Unknown2403 { get; set; } + public uint Unknown2404 { get; set; } + public uint Unknown2405 { get; set; } + public uint Unknown2406 { get; set; } + public uint Unknown2407 { get; set; } + public uint Unknown2408 { get; set; } + public uint Unknown2409 { get; set; } + public uint Unknown2410 { get; set; } + public uint Unknown2411 { get; set; } + public uint Unknown2412 { get; set; } + public uint Unknown2413 { get; set; } + public uint Unknown2414 { get; set; } + public uint Unknown2415 { get; set; } + public uint Unknown2416 { get; set; } + public uint Unknown2417 { get; set; } + public uint Unknown2418 { get; set; } + public uint Unknown2419 { get; set; } + public uint Unknown2420 { get; set; } + public uint Unknown2421 { get; set; } + public uint Unknown2422 { get; set; } + public uint Unknown2423 { get; set; } + public uint Unknown2424 { get; set; } + public uint Unknown2425 { get; set; } + public uint Unknown2426 { get; set; } + public uint Unknown2427 { get; set; } + public uint Unknown2428 { get; set; } + public uint Unknown2429 { get; set; } + public uint Unknown2430 { get; set; } + public uint Unknown2431 { get; set; } + public uint Unknown2432 { get; set; } + public uint Unknown2433 { get; set; } + public uint Unknown2434 { get; set; } + public uint Unknown2435 { get; set; } + public uint Unknown2436 { get; set; } + public uint Unknown2437 { get; set; } + public uint Unknown2438 { get; set; } + public uint Unknown2439 { get; set; } + public uint Unknown2440 { get; set; } + public uint Unknown2441 { get; set; } + public uint Unknown2442 { get; set; } + public uint Unknown2443 { get; set; } + public uint Unknown2444 { get; set; } + public uint Unknown2445 { get; set; } + public uint Unknown2446 { get; set; } + public uint Unknown2447 { get; set; } + public uint Unknown2448 { get; set; } + public uint Unknown2449 { get; set; } + public uint Unknown2450 { get; set; } + public uint Unknown2451 { get; set; } + public uint Unknown2452 { get; set; } + public uint Unknown2453 { get; set; } + public uint Unknown2454 { get; set; } + public uint Unknown2455 { get; set; } + public uint Unknown2456 { get; set; } + public uint Unknown2457 { get; set; } + public uint Unknown2458 { get; set; } + public uint Unknown2459 { get; set; } + public uint Unknown2460 { get; set; } + public uint Unknown2461 { get; set; } + public uint Unknown2462 { get; set; } + public uint Unknown2463 { get; set; } + public uint Unknown2464 { get; set; } + public uint Unknown2465 { get; set; } + public uint Unknown2466 { get; set; } + public uint Unknown2467 { get; set; } + public uint Unknown2468 { get; set; } + public uint Unknown2469 { get; set; } + public uint Unknown2470 { get; set; } + public uint Unknown2471 { get; set; } + public uint Unknown2472 { get; set; } + public uint Unknown2473 { get; set; } + public uint Unknown2474 { get; set; } + public uint Unknown2475 { get; set; } + public uint Unknown2476 { get; set; } + public uint Unknown2477 { get; set; } + public uint Unknown2478 { get; set; } + public uint Unknown2479 { get; set; } + public uint Unknown2480 { get; set; } + public uint Unknown2481 { get; set; } + public uint Unknown2482 { get; set; } + public uint Unknown2483 { get; set; } + public uint Unknown2484 { get; set; } + public uint Unknown2485 { get; set; } + public uint Unknown2486 { get; set; } + public uint Unknown2487 { get; set; } + public uint Unknown2488 { get; set; } + public uint Unknown2489 { get; set; } + public uint Unknown2490 { get; set; } + public uint Unknown2491 { get; set; } + public uint Unknown2492 { get; set; } + public uint Unknown2493 { get; set; } + public uint Unknown2494 { get; set; } + public uint Unknown2495 { get; set; } + public uint Unknown2496 { get; set; } + public uint Unknown2497 { get; set; } + public uint Unknown2498 { get; set; } + public uint Unknown2499 { get; set; } + public uint Unknown2500 { get; set; } + public uint Unknown2501 { get; set; } + public uint Unknown2502 { get; set; } + public uint Unknown2503 { get; set; } + public uint Unknown2504 { get; set; } + public uint Unknown2505 { get; set; } + public uint Unknown2506 { get; set; } + public uint Unknown2507 { get; set; } + public uint Unknown2508 { get; set; } + public uint Unknown2509 { get; set; } + public uint Unknown2510 { get; set; } + public uint Unknown2511 { get; set; } + public uint Unknown2512 { get; set; } + public uint Unknown2513 { get; set; } + public uint Unknown2514 { get; set; } + public uint Unknown2515 { get; set; } + public uint Unknown2516 { get; set; } + public uint Unknown2517 { get; set; } + public uint Unknown2518 { get; set; } + public uint Unknown2519 { get; set; } + public uint Unknown2520 { get; set; } + public uint Unknown2521 { get; set; } + public uint Unknown2522 { get; set; } + public uint Unknown2523 { get; set; } + public uint Unknown2524 { get; set; } + public uint Unknown2525 { get; set; } + public uint Unknown2526 { get; set; } + public uint Unknown2527 { get; set; } + public uint Unknown2528 { get; set; } + public uint Unknown2529 { get; set; } + public uint Unknown2530 { get; set; } + public uint Unknown2531 { get; set; } + public uint Unknown2532 { get; set; } + public uint Unknown2533 { get; set; } + public uint Unknown2534 { get; set; } + public uint Unknown2535 { get; set; } + public uint Unknown2536 { get; set; } + public uint Unknown2537 { get; set; } + public uint Unknown2538 { get; set; } + public uint Unknown2539 { get; set; } + public uint Unknown2540 { get; set; } + public uint Unknown2541 { get; set; } + public uint Unknown2542 { get; set; } + public uint Unknown2543 { get; set; } + public uint Unknown2544 { get; set; } + public uint Unknown2545 { get; set; } + public uint Unknown2546 { get; set; } + public uint Unknown2547 { get; set; } + public uint Unknown2548 { get; set; } + public uint Unknown2549 { get; set; } + public uint Unknown2550 { get; set; } + public uint Unknown2551 { get; set; } + public uint Unknown2552 { get; set; } + public uint Unknown2553 { get; set; } + public uint Unknown2554 { get; set; } + public uint Unknown2555 { get; set; } + public uint Unknown2556 { get; set; } + public uint Unknown2557 { get; set; } + public uint Unknown2558 { get; set; } + public uint Unknown2559 { get; set; } + public uint Unknown2560 { get; set; } + public uint Unknown2561 { get; set; } + public uint Unknown2562 { get; set; } + public uint Unknown2563 { get; set; } + public uint Unknown2564 { get; set; } + public uint Unknown2565 { get; set; } + public uint Unknown2566 { get; set; } + public uint Unknown2567 { get; set; } + public uint Unknown2568 { get; set; } + public uint Unknown2569 { get; set; } + public uint Unknown2570 { get; set; } + public uint Unknown2571 { get; set; } + public uint Unknown2572 { get; set; } + public uint Unknown2573 { get; set; } + public uint Unknown2574 { get; set; } + public uint Unknown2575 { get; set; } + public uint Unknown2576 { get; set; } + public uint Unknown2577 { get; set; } + public uint Unknown2578 { get; set; } + public uint Unknown2579 { get; set; } + public uint Unknown2580 { get; set; } + public uint Unknown2581 { get; set; } + public uint Unknown2582 { get; set; } + public uint Unknown2583 { get; set; } + public uint Unknown2584 { get; set; } + public uint Unknown2585 { get; set; } + public uint Unknown2586 { get; set; } + public uint Unknown2587 { get; set; } + public uint Unknown2588 { get; set; } + public uint Unknown2589 { get; set; } + public uint Unknown2590 { get; set; } + public uint Unknown2591 { get; set; } + public uint Unknown2592 { get; set; } + public uint Unknown2593 { get; set; } + public uint Unknown2594 { get; set; } + public uint Unknown2595 { get; set; } + public uint Unknown2596 { get; set; } + public uint Unknown2597 { get; set; } + public uint Unknown2598 { get; set; } + public uint Unknown2599 { get; set; } + public uint Unknown2600 { get; set; } + public uint Unknown2601 { get; set; } + public uint Unknown2602 { get; set; } + public uint Unknown2603 { get; set; } + public uint Unknown2604 { get; set; } + public uint Unknown2605 { get; set; } + public uint Unknown2606 { get; set; } + public uint Unknown2607 { get; set; } + public uint Unknown2608 { get; set; } + public uint Unknown2609 { get; set; } + public uint Unknown2610 { get; set; } + public uint Unknown2611 { get; set; } + public uint Unknown2612 { get; set; } + public uint Unknown2613 { get; set; } + public uint Unknown2614 { get; set; } + public uint Unknown2615 { get; set; } + public uint Unknown2616 { get; set; } + public uint Unknown2617 { get; set; } + public uint Unknown2618 { get; set; } + public uint Unknown2619 { get; set; } + public uint Unknown2620 { get; set; } + public uint Unknown2621 { get; set; } + public uint Unknown2622 { get; set; } + public uint Unknown2623 { get; set; } + public uint Unknown2624 { get; set; } + public uint Unknown2625 { get; set; } + public uint Unknown2626 { get; set; } + public uint Unknown2627 { get; set; } + public uint Unknown2628 { get; set; } + public uint Unknown2629 { get; set; } + public uint Unknown2630 { get; set; } + public uint Unknown2631 { get; set; } + public uint Unknown2632 { get; set; } + public uint Unknown2633 { get; set; } + public uint Unknown2634 { get; set; } + public uint Unknown2635 { get; set; } + public uint Unknown2636 { get; set; } + public uint Unknown2637 { get; set; } + public uint Unknown2638 { get; set; } + public uint Unknown2639 { get; set; } + public uint Unknown2640 { get; set; } + public uint Unknown2641 { get; set; } + public uint Unknown2642 { get; set; } + public uint Unknown2643 { get; set; } + public uint Unknown2644 { get; set; } + public uint Unknown2645 { get; set; } + public uint Unknown2646 { get; set; } + public uint Unknown2647 { get; set; } + public uint Unknown2648 { get; set; } + public uint Unknown2649 { get; set; } + public uint Unknown2650 { get; set; } + public uint Unknown2651 { get; set; } + public uint Unknown2652 { get; set; } + public uint Unknown2653 { get; set; } + public uint Unknown2654 { get; set; } + public uint Unknown2655 { get; set; } + public uint Unknown2656 { get; set; } + public uint Unknown2657 { get; set; } + public uint Unknown2658 { get; set; } + public uint Unknown2659 { get; set; } + public uint Unknown2660 { get; set; } + public uint Unknown2661 { get; set; } + public uint Unknown2662 { get; set; } + public uint Unknown2663 { get; set; } + public uint Unknown2664 { get; set; } + public uint Unknown2665 { get; set; } + public uint Unknown2666 { get; set; } + public uint Unknown2667 { get; set; } + public uint Unknown2668 { get; set; } + public uint Unknown2669 { get; set; } + public uint Unknown2670 { get; set; } + public uint Unknown2671 { get; set; } + public uint Unknown2672 { get; set; } + public uint Unknown2673 { get; set; } + public uint Unknown2674 { get; set; } + public uint Unknown2675 { get; set; } + public uint Unknown2676 { get; set; } + public uint Unknown2677 { get; set; } + public uint Unknown2678 { get; set; } + public uint Unknown2679 { get; set; } + public uint Unknown2680 { get; set; } + public uint Unknown2681 { get; set; } + public uint Unknown2682 { get; set; } + public uint Unknown2683 { get; set; } + public uint Unknown2684 { get; set; } + public uint Unknown2685 { get; set; } + public uint Unknown2686 { get; set; } + public uint Unknown2687 { get; set; } + public uint Unknown2688 { get; set; } + public uint Unknown2689 { get; set; } + public uint Unknown2690 { get; set; } + public uint Unknown2691 { get; set; } + public uint Unknown2692 { get; set; } + public uint Unknown2693 { get; set; } + public uint Unknown2694 { get; set; } + public uint Unknown2695 { get; set; } + public uint Unknown2696 { get; set; } + public uint Unknown2697 { get; set; } + public uint Unknown2698 { get; set; } + public uint Unknown2699 { get; set; } + public uint Unknown2700 { get; set; } + public uint Unknown2701 { get; set; } + public uint Unknown2702 { get; set; } + public uint Unknown2703 { get; set; } + public uint Unknown2704 { get; set; } + public uint Unknown2705 { get; set; } + public uint Unknown2706 { get; set; } + public uint Unknown2707 { get; set; } + public uint Unknown2708 { get; set; } + public uint Unknown2709 { get; set; } + public uint Unknown2710 { get; set; } + public uint Unknown2711 { get; set; } + public uint Unknown2712 { get; set; } + public uint Unknown2713 { get; set; } + public uint Unknown2714 { get; set; } + public uint Unknown2715 { get; set; } + public uint Unknown2716 { get; set; } + public uint Unknown2717 { get; set; } + public uint Unknown2718 { get; set; } + public uint Unknown2719 { get; set; } + public uint Unknown2720 { get; set; } + public uint Unknown2721 { get; set; } + public uint Unknown2722 { get; set; } + public uint Unknown2723 { get; set; } + public uint Unknown2724 { get; set; } + public uint Unknown2725 { get; set; } + public uint Unknown2726 { get; set; } + public uint Unknown2727 { get; set; } + public uint Unknown2728 { get; set; } + public uint Unknown2729 { get; set; } + public uint Unknown2730 { get; set; } + public uint Unknown2731 { get; set; } + public uint Unknown2732 { get; set; } + public uint Unknown2733 { get; set; } + public uint Unknown2734 { get; set; } + public uint Unknown2735 { get; set; } + public uint Unknown2736 { get; set; } + public uint Unknown2737 { get; set; } + public uint Unknown2738 { get; set; } + public uint Unknown2739 { get; set; } + public uint Unknown2740 { get; set; } + public uint Unknown2741 { get; set; } + public uint Unknown2742 { get; set; } + public uint Unknown2743 { get; set; } + public uint Unknown2744 { get; set; } + public uint Unknown2745 { get; set; } + public uint Unknown2746 { get; set; } + public uint Unknown2747 { get; set; } + public uint Unknown2748 { get; set; } + public uint Unknown2749 { get; set; } + public uint Unknown2750 { get; set; } + public uint Unknown2751 { get; set; } + public uint Unknown2752 { get; set; } + public uint Unknown2753 { get; set; } + public uint Unknown2754 { get; set; } + public uint Unknown2755 { get; set; } + public uint Unknown2756 { get; set; } + public uint Unknown2757 { get; set; } + public uint Unknown2758 { get; set; } + public uint Unknown2759 { get; set; } + public uint Unknown2760 { get; set; } + public uint Unknown2761 { get; set; } + public uint Unknown2762 { get; set; } + public uint Unknown2763 { get; set; } + public uint Unknown2764 { get; set; } + public uint Unknown2765 { get; set; } + public uint Unknown2766 { get; set; } + public uint Unknown2767 { get; set; } + public uint Unknown2768 { get; set; } + public uint Unknown2769 { get; set; } + public uint Unknown2770 { get; set; } + public uint Unknown2771 { get; set; } + public uint Unknown2772 { get; set; } + public uint Unknown2773 { get; set; } + public uint Unknown2774 { get; set; } + public uint Unknown2775 { get; set; } + public uint Unknown2776 { get; set; } + public uint Unknown2777 { get; set; } + public uint Unknown2778 { get; set; } + public uint Unknown2779 { get; set; } + public uint Unknown2780 { get; set; } + public uint Unknown2781 { get; set; } + public uint Unknown2782 { get; set; } + public uint Unknown2783 { get; set; } + public uint Unknown2784 { get; set; } + public uint Unknown2785 { get; set; } + public uint Unknown2786 { get; set; } + public uint Unknown2787 { get; set; } + public uint Unknown2788 { get; set; } + public uint Unknown2789 { get; set; } + public uint Unknown2790 { get; set; } + public uint Unknown2791 { get; set; } + public uint Unknown2792 { get; set; } + public uint Unknown2793 { get; set; } + public uint Unknown2794 { get; set; } + public uint Unknown2795 { get; set; } + public uint Unknown2796 { get; set; } + public uint Unknown2797 { get; set; } + public uint Unknown2798 { get; set; } + public uint Unknown2799 { get; set; } + public uint Unknown2800 { get; set; } + public uint Unknown2801 { get; set; } + public uint Unknown2802 { get; set; } + public uint Unknown2803 { get; set; } + public uint Unknown2804 { get; set; } + public uint Unknown2805 { get; set; } + public uint Unknown2806 { get; set; } + public uint Unknown2807 { get; set; } + public uint Unknown2808 { get; set; } + public uint Unknown2809 { get; set; } + public uint Unknown2810 { get; set; } + public uint Unknown2811 { get; set; } + public uint Unknown2812 { get; set; } + public uint Unknown2813 { get; set; } + public uint Unknown2814 { get; set; } + public uint Unknown2815 { get; set; } + public uint Unknown2816 { get; set; } + public uint Unknown2817 { get; set; } + public uint Unknown2818 { get; set; } + public uint Unknown2819 { get; set; } + public uint Unknown2820 { get; set; } + public uint Unknown2821 { get; set; } + public uint Unknown2822 { get; set; } + public uint Unknown2823 { get; set; } + public uint Unknown2824 { get; set; } + public uint Unknown2825 { get; set; } + public uint Unknown2826 { get; set; } + public uint Unknown2827 { get; set; } + public uint Unknown2828 { get; set; } + public uint Unknown2829 { get; set; } + public uint Unknown2830 { get; set; } + public uint Unknown2831 { get; set; } + public uint Unknown2832 { get; set; } + public uint Unknown2833 { get; set; } + public uint Unknown2834 { get; set; } + public uint Unknown2835 { get; set; } + public uint Unknown2836 { get; set; } + public uint Unknown2837 { get; set; } + public uint Unknown2838 { get; set; } + public uint Unknown2839 { get; set; } + public uint Unknown2840 { get; set; } + public uint Unknown2841 { get; set; } + public uint Unknown2842 { get; set; } + public uint Unknown2843 { get; set; } + public uint Unknown2844 { get; set; } + public uint Unknown2845 { get; set; } + public uint Unknown2846 { get; set; } + public uint Unknown2847 { get; set; } + public uint Unknown2848 { get; set; } + public uint Unknown2849 { get; set; } + public uint Unknown2850 { get; set; } + public uint Unknown2851 { get; set; } + public uint Unknown2852 { get; set; } + public uint Unknown2853 { get; set; } + public uint Unknown2854 { get; set; } + public uint Unknown2855 { get; set; } + public uint Unknown2856 { get; set; } + public uint Unknown2857 { get; set; } + public uint Unknown2858 { get; set; } + public uint Unknown2859 { get; set; } + public uint Unknown2860 { get; set; } + public uint Unknown2861 { get; set; } + public uint Unknown2862 { get; set; } + public uint Unknown2863 { get; set; } + public uint Unknown2864 { get; set; } + public uint Unknown2865 { get; set; } + public uint Unknown2866 { get; set; } + public uint Unknown2867 { get; set; } + public uint Unknown2868 { get; set; } + public uint Unknown2869 { get; set; } + public uint Unknown2870 { get; set; } + public uint Unknown2871 { get; set; } + public uint Unknown2872 { get; set; } + public uint Unknown2873 { get; set; } + public uint Unknown2874 { get; set; } + public uint Unknown2875 { get; set; } + public uint Unknown2876 { get; set; } + public uint Unknown2877 { get; set; } + public uint Unknown2878 { get; set; } + public uint Unknown2879 { get; set; } + public uint Unknown2880 { get; set; } + public uint Unknown2881 { get; set; } + public uint Unknown2882 { get; set; } + public uint Unknown2883 { get; set; } + public uint Unknown2884 { get; set; } + public uint Unknown2885 { get; set; } + public uint Unknown2886 { get; set; } + public uint Unknown2887 { get; set; } + public uint Unknown2888 { get; set; } + public uint Unknown2889 { get; set; } + public uint Unknown2890 { get; set; } + public uint Unknown2891 { get; set; } + public uint Unknown2892 { get; set; } + public uint Unknown2893 { get; set; } + public uint Unknown2894 { get; set; } + public uint Unknown2895 { get; set; } + public uint Unknown2896 { get; set; } + public uint Unknown2897 { get; set; } + public uint Unknown2898 { get; set; } + public uint Unknown2899 { get; set; } + public uint Unknown2900 { get; set; } + public uint Unknown2901 { get; set; } + public uint Unknown2902 { get; set; } + public uint Unknown2903 { get; set; } + public uint Unknown2904 { get; set; } + public uint Unknown2905 { get; set; } + public uint Unknown2906 { get; set; } + public uint Unknown2907 { get; set; } + public uint Unknown2908 { get; set; } + public uint Unknown2909 { get; set; } + public uint Unknown2910 { get; set; } + public uint Unknown2911 { get; set; } + public uint Unknown2912 { get; set; } + public uint Unknown2913 { get; set; } + public uint Unknown2914 { get; set; } + public uint Unknown2915 { get; set; } + public uint Unknown2916 { get; set; } + public uint Unknown2917 { get; set; } + public uint Unknown2918 { get; set; } + public uint Unknown2919 { get; set; } + public uint Unknown2920 { get; set; } + public uint Unknown2921 { get; set; } + public uint Unknown2922 { get; set; } + public uint Unknown2923 { get; set; } + public uint Unknown2924 { get; set; } + public uint Unknown2925 { get; set; } + public uint Unknown2926 { get; set; } + public uint Unknown2927 { get; set; } + public uint Unknown2928 { get; set; } + public uint Unknown2929 { get; set; } + public uint Unknown2930 { get; set; } + public uint Unknown2931 { get; set; } + public uint Unknown2932 { get; set; } + public uint Unknown2933 { get; set; } + public uint Unknown2934 { get; set; } + public uint Unknown2935 { get; set; } + public uint Unknown2936 { get; set; } + public uint Unknown2937 { get; set; } + public uint Unknown2938 { get; set; } + public uint Unknown2939 { get; set; } + public uint Unknown2940 { get; set; } + public uint Unknown2941 { get; set; } + public uint Unknown2942 { get; set; } + public uint Unknown2943 { get; set; } + public uint Unknown2944 { get; set; } + public uint Unknown2945 { get; set; } + public uint Unknown2946 { get; set; } + public uint Unknown2947 { get; set; } + public uint Unknown2948 { get; set; } + public uint Unknown2949 { get; set; } + public uint Unknown2950 { get; set; } + public uint Unknown2951 { get; set; } + public uint Unknown2952 { get; set; } + public uint Unknown2953 { get; set; } + public uint Unknown2954 { get; set; } + public uint Unknown2955 { get; set; } + public uint Unknown2956 { get; set; } + public uint Unknown2957 { get; set; } + public uint Unknown2958 { get; set; } + public uint Unknown2959 { get; set; } + public uint Unknown2960 { get; set; } + public uint Unknown2961 { get; set; } + public uint Unknown2962 { get; set; } + public uint Unknown2963 { get; set; } + public uint Unknown2964 { get; set; } + public uint Unknown2965 { get; set; } + public uint Unknown2966 { get; set; } + public uint Unknown2967 { get; set; } + public uint Unknown2968 { get; set; } + public uint Unknown2969 { get; set; } + public uint Unknown2970 { get; set; } + public uint Unknown2971 { get; set; } + public uint Unknown2972 { get; set; } + public uint Unknown2973 { get; set; } + public uint Unknown2974 { get; set; } + public uint Unknown2975 { get; set; } + public uint Unknown2976 { get; set; } + public uint Unknown2977 { get; set; } + public uint Unknown2978 { get; set; } + public uint Unknown2979 { get; set; } + public uint Unknown2980 { get; set; } + public uint Unknown2981 { get; set; } + public uint Unknown2982 { get; set; } + public uint Unknown2983 { get; set; } + public uint Unknown2984 { get; set; } + public uint Unknown2985 { get; set; } + public uint Unknown2986 { get; set; } + public uint Unknown2987 { get; set; } + public uint Unknown2988 { get; set; } + public uint Unknown2989 { get; set; } + public uint Unknown2990 { get; set; } + public uint Unknown2991 { get; set; } + public uint Unknown2992 { get; set; } + public uint Unknown2993 { get; set; } + public uint Unknown2994 { get; set; } + public uint Unknown2995 { get; set; } + public uint Unknown2996 { get; set; } + public uint Unknown2997 { get; set; } + public uint Unknown2998 { get; set; } + public UnkStruct2999Struct[] UnkStruct2999 { get; set; } + public byte Unknown3009 { get; set; } + public byte Unknown3010 { get; set; } + public byte Unknown3011 { get; set; } + public byte Unknown3012 { get; set; } + public byte Unknown3013 { get; set; } + public byte Unknown3014 { get; set; } + public byte Unknown3015 { get; set; } + public byte Unknown3016 { get; set; } + public byte Unknown3017 { get; set; } + public byte Unknown3018 { get; set; } + public byte Unknown3019 { get; set; } + public byte Unknown3020 { get; set; } + public byte Unknown3021 { get; set; } + public byte Unknown3022 { get; set; } + public byte Unknown3023 { get; set; } + public byte Unknown3024 { get; set; } + public byte Unknown3025 { get; set; } + public byte Unknown3026 { get; set; } + public byte Unknown3027 { get; set; } + public byte Unknown3028 { get; set; } + public byte Unknown3029 { get; set; } + public byte Unknown3030 { get; set; } + public byte Unknown3031 { get; set; } + public byte Unknown3032 { get; set; } + public byte Unknown3033 { get; set; } + public byte Unknown3034 { get; set; } + public byte Unknown3035 { get; set; } + public byte Unknown3036 { get; set; } + public byte Unknown3037 { get; set; } + public byte Unknown3038 { get; set; } + public byte Unknown3039 { get; set; } + public byte Unknown3040 { get; set; } + public byte Unknown3041 { get; set; } + public byte Unknown3042 { get; set; } + public byte Unknown3043 { get; set; } + public byte Unknown3044 { get; set; } + public byte Unknown3045 { get; set; } + public byte Unknown3046 { get; set; } + public byte Unknown3047 { get; set; } + public byte Unknown3048 { get; set; } + public byte Unknown3049 { get; set; } + public byte Unknown3050 { get; set; } + public byte Unknown3051 { get; set; } + public byte Unknown3052 { get; set; } + public byte Unknown3053 { get; set; } + public byte Unknown3054 { get; set; } + public byte Unknown3055 { get; set; } + public byte Unknown3056 { get; set; } + public byte Unknown3057 { get; set; } + public byte Unknown3058 { get; set; } + public byte Unknown3059 { get; set; } + public byte Unknown3060 { get; set; } + public byte Unknown3061 { get; set; } + public byte Unknown3062 { get; set; } + public byte Unknown3063 { get; set; } + public byte Unknown3064 { get; set; } + public byte Unknown3065 { get; set; } + public byte Unknown3066 { get; set; } + public byte Unknown3067 { get; set; } + public byte Unknown3068 { get; set; } + public byte Unknown3069 { get; set; } + public byte Unknown3070 { get; set; } + public byte Unknown3071 { get; set; } + public byte Unknown3072 { get; set; } + public byte Unknown3073 { get; set; } + public byte Unknown3074 { get; set; } + public byte Unknown3075 { get; set; } + public byte Unknown3076 { get; set; } + public byte Unknown3077 { get; set; } + public byte Unknown3078 { get; set; } + public byte Unknown3079 { get; set; } + public byte Unknown3080 { get; set; } + public byte Unknown3081 { get; set; } + public byte Unknown3082 { get; set; } + public byte Unknown3083 { get; set; } + public byte Unknown3084 { get; set; } + public byte Unknown3085 { get; set; } + public byte Unknown3086 { get; set; } + public byte Unknown3087 { get; set; } + public byte Unknown3088 { get; set; } + public byte Unknown3089 { get; set; } + public byte Unknown3090 { get; set; } + public byte Unknown3091 { get; set; } + public byte Unknown3092 { get; set; } + public byte Unknown3093 { get; set; } + public byte Unknown3094 { get; set; } + public byte Unknown3095 { get; set; } + public byte Unknown3096 { get; set; } + public byte Unknown3097 { get; set; } + public byte Unknown3098 { get; set; } + public byte Unknown3099 { get; set; } + public byte Unknown3100 { get; set; } + public byte Unknown3101 { get; set; } + public byte Unknown3102 { get; set; } + public byte Unknown3103 { get; set; } + public byte Unknown3104 { get; set; } + public byte Unknown3105 { get; set; } + public byte Unknown3106 { get; set; } + public byte Unknown3107 { get; set; } + public byte Unknown3108 { get; set; } + public byte Unknown3109 { get; set; } + public byte Unknown3110 { get; set; } + public byte Unknown3111 { get; set; } + public byte Unknown3112 { get; set; } + public byte Unknown3113 { get; set; } + public byte Unknown3114 { get; set; } + public byte Unknown3115 { get; set; } + public byte Unknown3116 { get; set; } + public byte Unknown3117 { get; set; } + public byte Unknown3118 { get; set; } + public byte Unknown3119 { get; set; } + public byte Unknown3120 { get; set; } + public byte Unknown3121 { get; set; } + public byte Unknown3122 { get; set; } + public byte Unknown3123 { get; set; } + public byte Unknown3124 { get; set; } + public byte Unknown3125 { get; set; } + public byte Unknown3126 { get; set; } + public byte Unknown3127 { get; set; } + public byte Unknown3128 { get; set; } + public byte Unknown3129 { get; set; } + public byte Unknown3130 { get; set; } + public byte Unknown3131 { get; set; } + public byte Unknown3132 { get; set; } + public byte Unknown3133 { get; set; } + public byte Unknown3134 { get; set; } + public byte Unknown3135 { get; set; } + public byte Unknown3136 { get; set; } + public byte Unknown3137 { get; set; } + public byte Unknown3138 { get; set; } + public byte Unknown3139 { get; set; } + public byte Unknown3140 { get; set; } + public byte Unknown3141 { get; set; } + public byte Unknown3142 { get; set; } + public byte Unknown3143 { get; set; } + public byte Unknown3144 { get; set; } + public byte Unknown3145 { get; set; } + public byte Unknown3146 { get; set; } + public byte Unknown3147 { get; set; } + public byte Unknown3148 { get; set; } + public byte Unknown3149 { get; set; } + public byte Unknown3150 { get; set; } + public byte Unknown3151 { get; set; } + public byte Unknown3152 { get; set; } + public byte Unknown3153 { get; set; } + public byte Unknown3154 { get; set; } + public byte Unknown3155 { get; set; } + public byte Unknown3156 { get; set; } + public byte Unknown3157 { get; set; } + public byte Unknown3158 { get; set; } + public byte Unknown3159 { get; set; } + public byte Unknown3160 { get; set; } + public byte Unknown3161 { get; set; } + public byte Unknown3162 { get; set; } + public byte Unknown3163 { get; set; } + public byte Unknown3164 { get; set; } + public byte Unknown3165 { get; set; } + public byte Unknown3166 { get; set; } + public byte Unknown3167 { get; set; } + public byte Unknown3168 { get; set; } + public byte Unknown3169 { get; set; } + public byte Unknown3170 { get; set; } + public byte Unknown3171 { get; set; } + public byte Unknown3172 { get; set; } + public byte Unknown3173 { get; set; } + public byte Unknown3174 { get; set; } + public byte Unknown3175 { get; set; } + public byte Unknown3176 { get; set; } + public byte Unknown3177 { get; set; } + public byte Unknown3178 { get; set; } + public byte Unknown3179 { get; set; } + public byte Unknown3180 { get; set; } + public byte Unknown3181 { get; set; } + public byte Unknown3182 { get; set; } + public byte Unknown3183 { get; set; } + public byte Unknown3184 { get; set; } + public byte Unknown3185 { get; set; } + public byte Unknown3186 { get; set; } + public byte Unknown3187 { get; set; } + public byte Unknown3188 { get; set; } + public byte Unknown3189 { get; set; } + public byte Unknown3190 { get; set; } + public byte Unknown3191 { get; set; } + public byte Unknown3192 { get; set; } + public byte Unknown3193 { get; set; } + public byte Unknown3194 { get; set; } + public byte Unknown3195 { get; set; } + public byte Unknown3196 { get; set; } + public byte Unknown3197 { get; set; } + public byte Unknown3198 { get; set; } + public byte Unknown3199 { get; set; } + public byte Unknown3200 { get; set; } + public byte Unknown3201 { get; set; } + public byte Unknown3202 { get; set; } + public byte Unknown3203 { get; set; } + public byte Unknown3204 { get; set; } + public byte Unknown3205 { get; set; } + public byte Unknown3206 { get; set; } + public byte Unknown3207 { get; set; } + public byte Unknown3208 { get; set; } + public byte Unknown3209 { get; set; } + public byte Unknown3210 { get; set; } + public byte Unknown3211 { get; set; } + public byte Unknown3212 { get; set; } + public byte Unknown3213 { get; set; } + public byte Unknown3214 { get; set; } + public byte Unknown3215 { get; set; } + public byte Unknown3216 { get; set; } + public byte Unknown3217 { get; set; } + public byte Unknown3218 { get; set; } + public byte Unknown3219 { get; set; } + public byte Unknown3220 { get; set; } + public byte Unknown3221 { get; set; } + public byte Unknown3222 { get; set; } + public byte Unknown3223 { get; set; } + public byte Unknown3224 { get; set; } + public byte Unknown3225 { get; set; } + public byte Unknown3226 { get; set; } + public byte Unknown3227 { get; set; } + public byte Unknown3228 { get; set; } + public byte Unknown3229 { get; set; } + public byte Unknown3230 { get; set; } + public byte Unknown3231 { get; set; } + public byte Unknown3232 { get; set; } + public byte Unknown3233 { get; set; } + public byte Unknown3234 { get; set; } + public byte Unknown3235 { get; set; } + public byte Unknown3236 { get; set; } + public byte Unknown3237 { get; set; } + public byte Unknown3238 { get; set; } + public byte Unknown3239 { get; set; } + public byte Unknown3240 { get; set; } + public byte Unknown3241 { get; set; } + public byte Unknown3242 { get; set; } + public byte Unknown3243 { get; set; } + public byte Unknown3244 { get; set; } + public byte Unknown3245 { get; set; } + public byte Unknown3246 { get; set; } + public byte Unknown3247 { get; set; } + public byte Unknown3248 { get; set; } + public byte Unknown3249 { get; set; } + public byte Unknown3250 { get; set; } + public byte Unknown3251 { get; set; } + public byte Unknown3252 { get; set; } + public byte Unknown3253 { get; set; } + public byte Unknown3254 { get; set; } + public byte Unknown3255 { get; set; } + public byte Unknown3256 { get; set; } + public byte Unknown3257 { get; set; } + public byte Unknown3258 { get; set; } + public byte Unknown3259 { get; set; } + public byte Unknown3260 { get; set; } + public byte Unknown3261 { get; set; } + public byte Unknown3262 { get; set; } + public byte Unknown3263 { get; set; } + public byte Unknown3264 { get; set; } + public byte Unknown3265 { get; set; } + public byte Unknown3266 { get; set; } + public byte Unknown3267 { get; set; } + public byte Unknown3268 { get; set; } + public byte Unknown3269 { get; set; } + public byte Unknown3270 { get; set; } + public byte Unknown3271 { get; set; } + public byte Unknown3272 { get; set; } + public byte Unknown3273 { get; set; } + public byte Unknown3274 { get; set; } + public byte Unknown3275 { get; set; } + public byte Unknown3276 { get; set; } + public byte Unknown3277 { get; set; } + public byte Unknown3278 { get; set; } + public byte[] VoiceStruct { get; set; } + public int[] Unknown3291 { get; set; } + public int Unknown3298 { get; set; } + public int Unknown3299 { get; set; } + public int Unknown3300 { get; set; } + public int Unknown3301 { get; set; } + public int Unknown3302 { get; set; } + public int Unknown3303 { get; set; } + public int Unknown3304 { get; set; } + public int Unknown3305 { get; set; } + public int Unknown3306 { get; set; } + public int Unknown3307 { get; set; } + public int Unknown3308 { get; set; } + public int Unknown3309 { get; set; } + public int Unknown3310 { get; set; } + public int Unknown3311 { get; set; } + public int Unknown3312 { get; set; } + public int Unknown3313 { get; set; } + public int Unknown3314 { get; set; } + public int Unknown3315 { get; set; } + public int Unknown3316 { get; set; } + public int Unknown3317 { get; set; } + public int Unknown3318 { get; set; } + public int Unknown3319 { get; set; } + public int Unknown3320 { get; set; } + public int Unknown3321 { get; set; } + public int Unknown3322 { get; set; } + public int Unknown3323 { get; set; } + public int Unknown3324 { get; set; } + public int Unknown3325 { get; set; } + public int Unknown3326 { get; set; } + public int Unknown3327 { get; set; } + public int Unknown3328 { get; set; } + public int Unknown3329 { get; set; } + public int Unknown3330 { get; set; } + public int Unknown3331 { get; set; } + public int Unknown3332 { get; set; } + public int Unknown3333 { get; set; } + public int Unknown3334 { get; set; } + public int Unknown3335 { get; set; } + public int Unknown3336 { get; set; } + public int Unknown3337 { get; set; } + public int Unknown3338 { get; set; } + public int Unknown3339 { get; set; } + public int Unknown3340 { get; set; } + public int Unknown3341 { get; set; } + public int Unknown3342 { get; set; } + public int Unknown3343 { get; set; } + public int Unknown3344 { get; set; } + public int Unknown3345 { get; set; } + public int Unknown3346 { get; set; } + public UnkStruct3347Struct[] UnkStruct3347 { get; set; } + public ulong Unknown3354 { get; set; } + public ulong Unknown3355 { get; set; } + public ulong Unknown3356 { get; set; } + public ulong Unknown3357 { get; set; } + public ulong Unknown3358 { get; set; } + public ulong Unknown3359 { get; set; } + public ulong Unknown3360 { get; set; } + public ulong Unknown3361 { get; set; } + public ulong Unknown3362 { get; set; } + public ulong Unknown3363 { get; set; } + public ulong Unknown3364 { get; set; } + public ulong Unknown3365 { get; set; } + public ulong Unknown3366 { get; set; } + public ulong Unknown3367 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Race = new LazyRow< Race >( lumina, parser.ReadColumn< int >( 0 ), language ); - Tribe = new LazyRow< Tribe >( lumina, parser.ReadColumn< int >( 1 ), language ); + Race = new LazyRow< Race >( gameData, parser.ReadColumn< int >( 0 ), language ); + Tribe = new LazyRow< Tribe >( gameData, parser.ReadColumn< int >( 1 ), language ); Gender = parser.ReadColumn< sbyte >( 2 ); Menu = new uint[ 28 ]; for( var i = 0; i < 28; i++ ) diff --git a/src/Lumina.Excel/GeneratedSheets/ChocoboRace.cs b/src/Lumina.Excel/GeneratedSheets/ChocoboRace.cs index 5004b4a8..40f67624 100644 --- a/src/Lumina.Excel/GeneratedSheets/ChocoboRace.cs +++ b/src/Lumina.Excel/GeneratedSheets/ChocoboRace.cs @@ -7,22 +7,18 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ChocoboRace", columnHash: 0xde74b4c4 )] - public class ChocoboRace : IExcelRow + public class ChocoboRace : ExcelRow { - public LazyRow< ChocoboRaceRank > ChocoboRaceRank; - public LazyRow< ChocoboRaceTerritory > ChocoboRaceTerritory; + public LazyRow< ChocoboRaceRank > ChocoboRaceRank { get; set; } + public LazyRow< ChocoboRaceTerritory > ChocoboRaceTerritory { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - ChocoboRaceRank = new LazyRow< ChocoboRaceRank >( lumina, parser.ReadColumn< byte >( 0 ), language ); - ChocoboRaceTerritory = new LazyRow< ChocoboRaceTerritory >( lumina, parser.ReadColumn< byte >( 1 ), language ); + ChocoboRaceRank = new LazyRow< ChocoboRaceRank >( gameData, parser.ReadColumn< byte >( 0 ), language ); + ChocoboRaceTerritory = new LazyRow< ChocoboRaceTerritory >( gameData, parser.ReadColumn< byte >( 1 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/ChocoboRaceAbility.cs b/src/Lumina.Excel/GeneratedSheets/ChocoboRaceAbility.cs index 36b552f3..fb119a1f 100644 --- a/src/Lumina.Excel/GeneratedSheets/ChocoboRaceAbility.cs +++ b/src/Lumina.Excel/GeneratedSheets/ChocoboRaceAbility.cs @@ -7,27 +7,23 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ChocoboRaceAbility", columnHash: 0xc68f9e95 )] - public class ChocoboRaceAbility : IExcelRow + public class ChocoboRaceAbility : ExcelRow { - public SeString Name; - public SeString Description; - public uint Icon; - public LazyRow< ChocoboRaceAbilityType > ChocoboRaceAbilityType; - public byte Value; + public SeString Name { get; set; } + public SeString Description { get; set; } + public uint Icon { get; set; } + public LazyRow< ChocoboRaceAbilityType > ChocoboRaceAbilityType { get; set; } + public byte Value { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); Description = parser.ReadColumn< SeString >( 1 ); Icon = parser.ReadColumn< uint >( 2 ); - ChocoboRaceAbilityType = new LazyRow< ChocoboRaceAbilityType >( lumina, parser.ReadColumn< sbyte >( 3 ), language ); + ChocoboRaceAbilityType = new LazyRow< ChocoboRaceAbilityType >( gameData, parser.ReadColumn< sbyte >( 3 ), language ); Value = parser.ReadColumn< byte >( 4 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/ChocoboRaceAbilityType.cs b/src/Lumina.Excel/GeneratedSheets/ChocoboRaceAbilityType.cs index 7bfef8d7..25665f54 100644 --- a/src/Lumina.Excel/GeneratedSheets/ChocoboRaceAbilityType.cs +++ b/src/Lumina.Excel/GeneratedSheets/ChocoboRaceAbilityType.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ChocoboRaceAbilityType", columnHash: 0xcd4cb81c )] - public class ChocoboRaceAbilityType : IExcelRow + public class ChocoboRaceAbilityType : ExcelRow { - public bool IsActive; + public bool IsActive { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); IsActive = parser.ReadColumn< bool >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/ChocoboRaceItem.cs b/src/Lumina.Excel/GeneratedSheets/ChocoboRaceItem.cs index b6a6b1cd..6db3889b 100644 --- a/src/Lumina.Excel/GeneratedSheets/ChocoboRaceItem.cs +++ b/src/Lumina.Excel/GeneratedSheets/ChocoboRaceItem.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ChocoboRaceItem", columnHash: 0x7a3e01e7 )] - public class ChocoboRaceItem : IExcelRow + public class ChocoboRaceItem : ExcelRow { - public SeString Name; - public SeString Description; - public uint Icon; + public SeString Name { get; set; } + public SeString Description { get; set; } + public uint Icon { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); Description = parser.ReadColumn< SeString >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/ChocoboRaceRank.cs b/src/Lumina.Excel/GeneratedSheets/ChocoboRaceRank.cs index 287fe0a1..86f95ef2 100644 --- a/src/Lumina.Excel/GeneratedSheets/ChocoboRaceRank.cs +++ b/src/Lumina.Excel/GeneratedSheets/ChocoboRaceRank.cs @@ -7,26 +7,22 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ChocoboRaceRank", columnHash: 0xf840eabf )] - public class ChocoboRaceRank : IExcelRow + public class ChocoboRaceRank : ExcelRow { - public ushort RatingMin; - public ushort RatingMax; - public LazyRow< GoldSaucerTextData > Name; - public ushort Fee; - public int Icon; + public ushort RatingMin { get; set; } + public ushort RatingMax { get; set; } + public LazyRow< GoldSaucerTextData > Name { get; set; } + public ushort Fee { get; set; } + public int Icon { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); RatingMin = parser.ReadColumn< ushort >( 0 ); RatingMax = parser.ReadColumn< ushort >( 1 ); - Name = new LazyRow< GoldSaucerTextData >( lumina, parser.ReadColumn< ushort >( 2 ), language ); + Name = new LazyRow< GoldSaucerTextData >( gameData, parser.ReadColumn< ushort >( 2 ), language ); Fee = parser.ReadColumn< ushort >( 3 ); Icon = parser.ReadColumn< int >( 4 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/ChocoboRaceStatus.cs b/src/Lumina.Excel/GeneratedSheets/ChocoboRaceStatus.cs index eb19fa6a..b7997d31 100644 --- a/src/Lumina.Excel/GeneratedSheets/ChocoboRaceStatus.cs +++ b/src/Lumina.Excel/GeneratedSheets/ChocoboRaceStatus.cs @@ -7,21 +7,17 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ChocoboRaceStatus", columnHash: 0xf8ab135e )] - public class ChocoboRaceStatus : IExcelRow + public class ChocoboRaceStatus : ExcelRow { - public LazyRow< Status > Status; - public ushort Unknown1; + public LazyRow< Status > Status { get; set; } + public ushort Unknown1 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Status = new LazyRow< Status >( lumina, parser.ReadColumn< int >( 0 ), language ); + Status = new LazyRow< Status >( gameData, parser.ReadColumn< int >( 0 ), language ); Unknown1 = parser.ReadColumn< ushort >( 1 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/ChocoboRaceTerritory.cs b/src/Lumina.Excel/GeneratedSheets/ChocoboRaceTerritory.cs index e29ae8f7..448eef67 100644 --- a/src/Lumina.Excel/GeneratedSheets/ChocoboRaceTerritory.cs +++ b/src/Lumina.Excel/GeneratedSheets/ChocoboRaceTerritory.cs @@ -7,21 +7,17 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ChocoboRaceTerritory", columnHash: 0x39e8d543 )] - public class ChocoboRaceTerritory : IExcelRow + public class ChocoboRaceTerritory : ExcelRow { - public LazyRow< GoldSaucerTextData > Name; - public int Icon; + public LazyRow< GoldSaucerTextData > Name { get; set; } + public int Icon { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Name = new LazyRow< GoldSaucerTextData >( lumina, parser.ReadColumn< ushort >( 0 ), language ); + Name = new LazyRow< GoldSaucerTextData >( gameData, parser.ReadColumn< ushort >( 0 ), language ); Icon = parser.ReadColumn< int >( 1 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/ChocoboRaceTutorial.cs b/src/Lumina.Excel/GeneratedSheets/ChocoboRaceTutorial.cs index 7459fa87..0d327460 100644 --- a/src/Lumina.Excel/GeneratedSheets/ChocoboRaceTutorial.cs +++ b/src/Lumina.Excel/GeneratedSheets/ChocoboRaceTutorial.cs @@ -7,24 +7,20 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ChocoboRaceTutorial", columnHash: 0xef6c7b71 )] - public class ChocoboRaceTutorial : IExcelRow + public class ChocoboRaceTutorial : ExcelRow { - public LazyRow< NpcYell >[] NpcYell; - public ushort Unknown8; - public ushort Unknown9; + public LazyRow< NpcYell >[] NpcYell { get; set; } + public ushort Unknown8 { get; set; } + public ushort Unknown9 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); NpcYell = new LazyRow< NpcYell >[ 8 ]; for( var i = 0; i < 8; i++ ) - NpcYell[ i ] = new LazyRow< NpcYell >( lumina, parser.ReadColumn< int >( 0 + i ), language ); + NpcYell[ i ] = new LazyRow< NpcYell >( gameData, parser.ReadColumn< int >( 0 + i ), language ); Unknown8 = parser.ReadColumn< ushort >( 8 ); Unknown9 = parser.ReadColumn< ushort >( 9 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/ChocoboRaceWeather.cs b/src/Lumina.Excel/GeneratedSheets/ChocoboRaceWeather.cs index 7f151160..2fa7fe05 100644 --- a/src/Lumina.Excel/GeneratedSheets/ChocoboRaceWeather.cs +++ b/src/Lumina.Excel/GeneratedSheets/ChocoboRaceWeather.cs @@ -7,22 +7,18 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ChocoboRaceWeather", columnHash: 0xfaedad07 )] - public class ChocoboRaceWeather : IExcelRow + public class ChocoboRaceWeather : ExcelRow { - public LazyRow< Weather > WeatherType1; - public LazyRow< Weather > WeatherType2; + public LazyRow< Weather > WeatherType1 { get; set; } + public LazyRow< Weather > WeatherType2 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - WeatherType1 = new LazyRow< Weather >( lumina, parser.ReadColumn< int >( 0 ), language ); - WeatherType2 = new LazyRow< Weather >( lumina, parser.ReadColumn< int >( 1 ), language ); + WeatherType1 = new LazyRow< Weather >( gameData, parser.ReadColumn< int >( 0 ), language ); + WeatherType2 = new LazyRow< Weather >( gameData, parser.ReadColumn< int >( 1 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/ChocoboTaxi.cs b/src/Lumina.Excel/GeneratedSheets/ChocoboTaxi.cs index da90148e..4005e0ce 100644 --- a/src/Lumina.Excel/GeneratedSheets/ChocoboTaxi.cs +++ b/src/Lumina.Excel/GeneratedSheets/ChocoboTaxi.cs @@ -7,22 +7,18 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ChocoboTaxi", columnHash: 0x121fc5dc )] - public class ChocoboTaxi : IExcelRow + public class ChocoboTaxi : ExcelRow { - public LazyRow< ChocoboTaxiStand > Location; - public byte Fare; - public ushort TimeRequired; + public LazyRow< ChocoboTaxiStand > Location { get; set; } + public byte Fare { get; set; } + public ushort TimeRequired { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Location = new LazyRow< ChocoboTaxiStand >( lumina, parser.ReadColumn< uint >( 0 ), language ); + Location = new LazyRow< ChocoboTaxiStand >( gameData, parser.ReadColumn< uint >( 0 ), language ); Fare = parser.ReadColumn< byte >( 1 ); TimeRequired = parser.ReadColumn< ushort >( 2 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/ChocoboTaxiStand.cs b/src/Lumina.Excel/GeneratedSheets/ChocoboTaxiStand.cs index 83d96c9e..021d4096 100644 --- a/src/Lumina.Excel/GeneratedSheets/ChocoboTaxiStand.cs +++ b/src/Lumina.Excel/GeneratedSheets/ChocoboTaxiStand.cs @@ -7,23 +7,19 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ChocoboTaxiStand", columnHash: 0x233d23d9 )] - public class ChocoboTaxiStand : IExcelRow + public class ChocoboTaxiStand : ExcelRow { - public LazyRow< ChocoboTaxi >[] TargetLocations; - public SeString PlaceName; + public LazyRow< ChocoboTaxi >[] TargetLocations { get; set; } + public SeString PlaceName { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); TargetLocations = new LazyRow< ChocoboTaxi >[ 8 ]; for( var i = 0; i < 8; i++ ) - TargetLocations[ i ] = new LazyRow< ChocoboTaxi >( lumina, parser.ReadColumn< ushort >( 0 + i ), language ); + TargetLocations[ i ] = new LazyRow< ChocoboTaxi >( gameData, parser.ReadColumn< ushort >( 0 + i ), language ); PlaceName = parser.ReadColumn< SeString >( 8 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/CircleActivity.cs b/src/Lumina.Excel/GeneratedSheets/CircleActivity.cs index a76be28d..bd1e9016 100644 --- a/src/Lumina.Excel/GeneratedSheets/CircleActivity.cs +++ b/src/Lumina.Excel/GeneratedSheets/CircleActivity.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "CircleActivity", columnHash: 0x1a6ae0b3 )] - public class CircleActivity : IExcelRow + public class CircleActivity : ExcelRow { - public SeString Name; - public int Icon; - public ushort Order; + public SeString Name { get; set; } + public int Icon { get; set; } + public ushort Order { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); Icon = parser.ReadColumn< int >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/ClassJob.cs b/src/Lumina.Excel/GeneratedSheets/ClassJob.cs index f4f56962..ce12aa75 100644 --- a/src/Lumina.Excel/GeneratedSheets/ClassJob.cs +++ b/src/Lumina.Excel/GeneratedSheets/ClassJob.cs @@ -7,73 +7,69 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ClassJob", columnHash: 0x590ba68f )] - public class ClassJob : IExcelRow + public class ClassJob : ExcelRow { - public SeString Name; - public SeString Abbreviation; - public SeString Unknown2; - public LazyRow< ClassJobCategory > ClassJobCategory; - public sbyte ExpArrayIndex; - public sbyte BattleClassIndex; - public byte Unknown6; - public byte JobIndex; - public sbyte Unknown8; - public ushort ModifierHitPoints; - public ushort ModifierManaPoints; - public ushort ModifierStrength; - public ushort ModifierVitality; - public ushort ModifierDexterity; - public ushort ModifierIntelligence; - public ushort ModifierMind; - public ushort ModifierPiety; - public ushort Unknown17; - public ushort Unknown18; - public ushort Unknown19; - public ushort Unknown20; - public ushort Unknown21; - public ushort Unknown22; - public byte Unknown23; - public byte Unknown24; - public byte Unknown25; - public LazyRow< ClassJob > ClassJobParent; - public SeString NameEnglish; - public LazyRow< Item > ItemStartingWeapon; - public int Unknown29; - public byte Role; - public LazyRow< Town > StartingTown; - public LazyRow< MonsterNote > MonsterNote; - public byte PrimaryStat; - public LazyRow< Action > LimitBreak1; - public LazyRow< Action > LimitBreak2; - public LazyRow< Action > LimitBreak3; - public byte UIPriority; - public LazyRow< Item > ItemSoulCrystal; - public LazyRow< Quest > UnlockQuest; - public LazyRow< Quest > RelicQuest; - public LazyRow< Quest > Prerequisite; - public byte StartingLevel; - public byte PartyBonus; - public bool IsLimitedJob; - public bool CanQueueForDuty; + public SeString Name { get; set; } + public SeString Abbreviation { get; set; } + public SeString Unknown2 { get; set; } + public LazyRow< ClassJobCategory > ClassJobCategory { get; set; } + public sbyte ExpArrayIndex { get; set; } + public sbyte BattleClassIndex { get; set; } + public byte Unknown6 { get; set; } + public byte JobIndex { get; set; } + public sbyte DohDolJobIndex { get; set; } + public ushort ModifierHitPoints { get; set; } + public ushort ModifierManaPoints { get; set; } + public ushort ModifierStrength { get; set; } + public ushort ModifierVitality { get; set; } + public ushort ModifierDexterity { get; set; } + public ushort ModifierIntelligence { get; set; } + public ushort ModifierMind { get; set; } + public ushort ModifierPiety { get; set; } + public ushort Unknown17 { get; set; } + public ushort Unknown18 { get; set; } + public ushort Unknown19 { get; set; } + public ushort Unknown20 { get; set; } + public ushort Unknown21 { get; set; } + public ushort Unknown22 { get; set; } + public byte Unknown23 { get; set; } + public byte Unknown24 { get; set; } + public byte Unknown25 { get; set; } + public LazyRow< ClassJob > ClassJobParent { get; set; } + public SeString NameEnglish { get; set; } + public LazyRow< Item > ItemStartingWeapon { get; set; } + public int Unknown29 { get; set; } + public byte Role { get; set; } + public LazyRow< Town > StartingTown { get; set; } + public LazyRow< MonsterNote > MonsterNote { get; set; } + public byte PrimaryStat { get; set; } + public LazyRow< Action > LimitBreak1 { get; set; } + public LazyRow< Action > LimitBreak2 { get; set; } + public LazyRow< Action > LimitBreak3 { get; set; } + public byte UIPriority { get; set; } + public LazyRow< Item > ItemSoulCrystal { get; set; } + public LazyRow< Quest > UnlockQuest { get; set; } + public LazyRow< Quest > RelicQuest { get; set; } + public LazyRow< Quest > Prerequisite { get; set; } + public byte StartingLevel { get; set; } + public byte PartyBonus { get; set; } + public bool IsLimitedJob { get; set; } + public bool CanQueueForDuty { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); Abbreviation = parser.ReadColumn< SeString >( 1 ); Unknown2 = parser.ReadColumn< SeString >( 2 ); - ClassJobCategory = new LazyRow< ClassJobCategory >( lumina, parser.ReadColumn< byte >( 3 ), language ); + ClassJobCategory = new LazyRow< ClassJobCategory >( gameData, parser.ReadColumn< byte >( 3 ), language ); ExpArrayIndex = parser.ReadColumn< sbyte >( 4 ); BattleClassIndex = parser.ReadColumn< sbyte >( 5 ); Unknown6 = parser.ReadColumn< byte >( 6 ); JobIndex = parser.ReadColumn< byte >( 7 ); - Unknown8 = parser.ReadColumn< sbyte >( 8 ); + DohDolJobIndex = parser.ReadColumn< sbyte >( 8 ); ModifierHitPoints = parser.ReadColumn< ushort >( 9 ); ModifierManaPoints = parser.ReadColumn< ushort >( 10 ); ModifierStrength = parser.ReadColumn< ushort >( 11 ); @@ -91,22 +87,22 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) Unknown23 = parser.ReadColumn< byte >( 23 ); Unknown24 = parser.ReadColumn< byte >( 24 ); Unknown25 = parser.ReadColumn< byte >( 25 ); - ClassJobParent = new LazyRow< ClassJob >( lumina, parser.ReadColumn< byte >( 26 ), language ); + ClassJobParent = new LazyRow< ClassJob >( gameData, parser.ReadColumn< byte >( 26 ), language ); NameEnglish = parser.ReadColumn< SeString >( 27 ); - ItemStartingWeapon = new LazyRow< Item >( lumina, parser.ReadColumn< int >( 28 ), language ); + ItemStartingWeapon = new LazyRow< Item >( gameData, parser.ReadColumn< int >( 28 ), language ); Unknown29 = parser.ReadColumn< int >( 29 ); Role = parser.ReadColumn< byte >( 30 ); - StartingTown = new LazyRow< Town >( lumina, parser.ReadColumn< byte >( 31 ), language ); - MonsterNote = new LazyRow< MonsterNote >( lumina, parser.ReadColumn< sbyte >( 32 ), language ); + StartingTown = new LazyRow< Town >( gameData, parser.ReadColumn< byte >( 31 ), language ); + MonsterNote = new LazyRow< MonsterNote >( gameData, parser.ReadColumn< sbyte >( 32 ), language ); PrimaryStat = parser.ReadColumn< byte >( 33 ); - LimitBreak1 = new LazyRow< Action >( lumina, parser.ReadColumn< ushort >( 34 ), language ); - LimitBreak2 = new LazyRow< Action >( lumina, parser.ReadColumn< ushort >( 35 ), language ); - LimitBreak3 = new LazyRow< Action >( lumina, parser.ReadColumn< ushort >( 36 ), language ); + LimitBreak1 = new LazyRow< Action >( gameData, parser.ReadColumn< ushort >( 34 ), language ); + LimitBreak2 = new LazyRow< Action >( gameData, parser.ReadColumn< ushort >( 35 ), language ); + LimitBreak3 = new LazyRow< Action >( gameData, parser.ReadColumn< ushort >( 36 ), language ); UIPriority = parser.ReadColumn< byte >( 37 ); - ItemSoulCrystal = new LazyRow< Item >( lumina, parser.ReadColumn< uint >( 38 ), language ); - UnlockQuest = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 39 ), language ); - RelicQuest = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 40 ), language ); - Prerequisite = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 41 ), language ); + ItemSoulCrystal = new LazyRow< Item >( gameData, parser.ReadColumn< uint >( 38 ), language ); + UnlockQuest = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 39 ), language ); + RelicQuest = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 40 ), language ); + Prerequisite = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 41 ), language ); StartingLevel = parser.ReadColumn< byte >( 42 ); PartyBonus = parser.ReadColumn< byte >( 43 ); IsLimitedJob = parser.ReadColumn< bool >( 44 ); diff --git a/src/Lumina.Excel/GeneratedSheets/ClassJobCategory.cs b/src/Lumina.Excel/GeneratedSheets/ClassJobCategory.cs index 78865975..b6888d23 100644 --- a/src/Lumina.Excel/GeneratedSheets/ClassJobCategory.cs +++ b/src/Lumina.Excel/GeneratedSheets/ClassJobCategory.cs @@ -7,57 +7,53 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ClassJobCategory", columnHash: 0xd6e993c1 )] - public class ClassJobCategory : IExcelRow + public class ClassJobCategory : ExcelRow { - public SeString Name; - public bool ADV; - public bool GLA; - public bool PGL; - public bool MRD; - public bool LNC; - public bool ARC; - public bool CNJ; - public bool THM; - public bool CRP; - public bool BSM; - public bool ARM; - public bool GSM; - public bool LTW; - public bool WVR; - public bool ALC; - public bool CUL; - public bool MIN; - public bool BTN; - public bool FSH; - public bool PLD; - public bool MNK; - public bool WAR; - public bool DRG; - public bool BRD; - public bool WHM; - public bool BLM; - public bool ACN; - public bool SMN; - public bool SCH; - public bool ROG; - public bool NIN; - public bool MCH; - public bool DRK; - public bool AST; - public bool SAM; - public bool RDM; - public bool BLU; - public bool GNB; - public bool DNC; + public SeString Name { get; set; } + public bool ADV { get; set; } + public bool GLA { get; set; } + public bool PGL { get; set; } + public bool MRD { get; set; } + public bool LNC { get; set; } + public bool ARC { get; set; } + public bool CNJ { get; set; } + public bool THM { get; set; } + public bool CRP { get; set; } + public bool BSM { get; set; } + public bool ARM { get; set; } + public bool GSM { get; set; } + public bool LTW { get; set; } + public bool WVR { get; set; } + public bool ALC { get; set; } + public bool CUL { get; set; } + public bool MIN { get; set; } + public bool BTN { get; set; } + public bool FSH { get; set; } + public bool PLD { get; set; } + public bool MNK { get; set; } + public bool WAR { get; set; } + public bool DRG { get; set; } + public bool BRD { get; set; } + public bool WHM { get; set; } + public bool BLM { get; set; } + public bool ACN { get; set; } + public bool SMN { get; set; } + public bool SCH { get; set; } + public bool ROG { get; set; } + public bool NIN { get; set; } + public bool MCH { get; set; } + public bool DRK { get; set; } + public bool AST { get; set; } + public bool SAM { get; set; } + public bool RDM { get; set; } + public bool BLU { get; set; } + public bool GNB { get; set; } + public bool DNC { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); ADV = parser.ReadColumn< bool >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/CollectablesShop.cs b/src/Lumina.Excel/GeneratedSheets/CollectablesShop.cs index e82a115c..c74bd096 100644 --- a/src/Lumina.Excel/GeneratedSheets/CollectablesShop.cs +++ b/src/Lumina.Excel/GeneratedSheets/CollectablesShop.cs @@ -7,28 +7,24 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "CollectablesShop", columnHash: 0x6a066e9a )] - public class CollectablesShop : IExcelRow + public class CollectablesShop : ExcelRow { - public SeString Name; - public LazyRow< Quest > Quest; - public byte Unknown2; - public LazyRow< CollectablesShopItem >[] ShopItems; + public SeString Name { get; set; } + public LazyRow< Quest > Quest { get; set; } + public byte Unknown2 { get; set; } + public LazyRow< CollectablesShopItem >[] ShopItems { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); - Quest = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 1 ), language ); + Quest = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 1 ), language ); Unknown2 = parser.ReadColumn< byte >( 2 ); ShopItems = new LazyRow< CollectablesShopItem >[ 11 ]; for( var i = 0; i < 11; i++ ) - ShopItems[ i ] = new LazyRow< CollectablesShopItem >( lumina, parser.ReadColumn< ushort >( 3 + i ), language ); + ShopItems[ i ] = new LazyRow< CollectablesShopItem >( gameData, parser.ReadColumn< ushort >( 3 + i ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/CollectablesShopItem.cs b/src/Lumina.Excel/GeneratedSheets/CollectablesShopItem.cs index 77cf82a8..53c37b78 100644 --- a/src/Lumina.Excel/GeneratedSheets/CollectablesShopItem.cs +++ b/src/Lumina.Excel/GeneratedSheets/CollectablesShopItem.cs @@ -7,34 +7,30 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "CollectablesShopItem", columnHash: 0x392f49a3 )] - public class CollectablesShopItem : IExcelRow + public class CollectablesShopItem : ExcelRow { - public LazyRow< Item > Item; - public LazyRow< CollectablesShopItemGroup > CollectablesShopItemGroup; - public ushort LevelMin; - public ushort LevelMax; - public byte Unknown4; - public byte Unknown5; - public LazyRow< CollectablesShopRefine > CollectablesShopRefine; - public LazyRow< CollectablesShopRewardScrip > CollectablesShopRewardScrip; + public LazyRow< Item > Item { get; set; } + public LazyRow< CollectablesShopItemGroup > CollectablesShopItemGroup { get; set; } + public ushort LevelMin { get; set; } + public ushort LevelMax { get; set; } + public byte Unknown4 { get; set; } + public byte Unknown5 { get; set; } + public LazyRow< CollectablesShopRefine > CollectablesShopRefine { get; set; } + public LazyRow< CollectablesShopRewardScrip > CollectablesShopRewardScrip { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Item = new LazyRow< Item >( lumina, parser.ReadColumn< uint >( 0 ), language ); - CollectablesShopItemGroup = new LazyRow< CollectablesShopItemGroup >( lumina, parser.ReadColumn< byte >( 1 ), language ); + Item = new LazyRow< Item >( gameData, parser.ReadColumn< uint >( 0 ), language ); + CollectablesShopItemGroup = new LazyRow< CollectablesShopItemGroup >( gameData, parser.ReadColumn< byte >( 1 ), language ); LevelMin = parser.ReadColumn< ushort >( 2 ); LevelMax = parser.ReadColumn< ushort >( 3 ); Unknown4 = parser.ReadColumn< byte >( 4 ); Unknown5 = parser.ReadColumn< byte >( 5 ); - CollectablesShopRefine = new LazyRow< CollectablesShopRefine >( lumina, parser.ReadColumn< ushort >( 6 ), language ); - CollectablesShopRewardScrip = new LazyRow< CollectablesShopRewardScrip >( lumina, parser.ReadColumn< ushort >( 7 ), language ); + CollectablesShopRefine = new LazyRow< CollectablesShopRefine >( gameData, parser.ReadColumn< ushort >( 6 ), language ); + CollectablesShopRewardScrip = new LazyRow< CollectablesShopRewardScrip >( gameData, parser.ReadColumn< ushort >( 7 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/CollectablesShopItemGroup.cs b/src/Lumina.Excel/GeneratedSheets/CollectablesShopItemGroup.cs index 130d6e68..75a16b18 100644 --- a/src/Lumina.Excel/GeneratedSheets/CollectablesShopItemGroup.cs +++ b/src/Lumina.Excel/GeneratedSheets/CollectablesShopItemGroup.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "CollectablesShopItemGroup", columnHash: 0xdebb20e3 )] - public class CollectablesShopItemGroup : IExcelRow + public class CollectablesShopItemGroup : ExcelRow { - public SeString Name; + public SeString Name { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/CollectablesShopRefine.cs b/src/Lumina.Excel/GeneratedSheets/CollectablesShopRefine.cs index 96f51646..f991330a 100644 --- a/src/Lumina.Excel/GeneratedSheets/CollectablesShopRefine.cs +++ b/src/Lumina.Excel/GeneratedSheets/CollectablesShopRefine.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "CollectablesShopRefine", columnHash: 0xdc23efe7 )] - public class CollectablesShopRefine : IExcelRow + public class CollectablesShopRefine : ExcelRow { - public ushort LowCollectability; - public ushort MidCollectability; - public ushort HighCollectability; + public ushort LowCollectability { get; set; } + public ushort MidCollectability { get; set; } + public ushort HighCollectability { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); LowCollectability = parser.ReadColumn< ushort >( 0 ); MidCollectability = parser.ReadColumn< ushort >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/CollectablesShopRewardItem.cs b/src/Lumina.Excel/GeneratedSheets/CollectablesShopRewardItem.cs index f0e765d1..c27bd612 100644 --- a/src/Lumina.Excel/GeneratedSheets/CollectablesShopRewardItem.cs +++ b/src/Lumina.Excel/GeneratedSheets/CollectablesShopRewardItem.cs @@ -7,29 +7,25 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "CollectablesShopRewardItem", columnHash: 0xf7e08b71 )] - public class CollectablesShopRewardItem : IExcelRow + public class CollectablesShopRewardItem : ExcelRow { - public LazyRow< Item > Item; - public bool Unknown1; - public byte Unknown2; - public byte Unknown3; - public byte Unknown4; - public uint Unknown5; - public bool Unknown6; - public byte Unknown7; - public byte Unknown8; - public byte Unknown9; + public LazyRow< Item > Item { get; set; } + public bool Unknown1 { get; set; } + public byte Unknown2 { get; set; } + public byte Unknown3 { get; set; } + public byte Unknown4 { get; set; } + public uint Unknown5 { get; set; } + public bool Unknown6 { get; set; } + public byte Unknown7 { get; set; } + public byte Unknown8 { get; set; } + public byte Unknown9 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Item = new LazyRow< Item >( lumina, parser.ReadColumn< uint >( 0 ), language ); + Item = new LazyRow< Item >( gameData, parser.ReadColumn< uint >( 0 ), language ); Unknown1 = parser.ReadColumn< bool >( 1 ); Unknown2 = parser.ReadColumn< byte >( 2 ); Unknown3 = parser.ReadColumn< byte >( 3 ); diff --git a/src/Lumina.Excel/GeneratedSheets/CollectablesShopRewardScrip.cs b/src/Lumina.Excel/GeneratedSheets/CollectablesShopRewardScrip.cs index 2711ca17..c56d6789 100644 --- a/src/Lumina.Excel/GeneratedSheets/CollectablesShopRewardScrip.cs +++ b/src/Lumina.Excel/GeneratedSheets/CollectablesShopRewardScrip.cs @@ -7,26 +7,22 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "CollectablesShopRewardScrip", columnHash: 0x0c33ce97 )] - public class CollectablesShopRewardScrip : IExcelRow + public class CollectablesShopRewardScrip : ExcelRow { - public LazyRow< Currency > Currency; - public ushort LowReward; - public ushort MidReward; - public ushort HighReward; - public ushort ExpRatioLow; - public ushort ExpRatioMid; - public ushort ExpRatioHigh; + public ushort Currency { get; set; } + public ushort LowReward { get; set; } + public ushort MidReward { get; set; } + public ushort HighReward { get; set; } + public ushort ExpRatioLow { get; set; } + public ushort ExpRatioMid { get; set; } + public ushort ExpRatioHigh { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Currency = new LazyRow< Currency >( lumina, parser.ReadColumn< ushort >( 0 ), language ); + Currency = parser.ReadColumn< ushort >( 0 ); LowReward = parser.ReadColumn< ushort >( 1 ); MidReward = parser.ReadColumn< ushort >( 2 ); HighReward = parser.ReadColumn< ushort >( 3 ); diff --git a/src/Lumina.Excel/GeneratedSheets/Companion.cs b/src/Lumina.Excel/GeneratedSheets/Companion.cs index 995b4885..72ee2618 100644 --- a/src/Lumina.Excel/GeneratedSheets/Companion.cs +++ b/src/Lumina.Excel/GeneratedSheets/Companion.cs @@ -7,55 +7,51 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Companion", columnHash: 0x776048c3 )] - public class Companion : IExcelRow + public class Companion : ExcelRow { - public SeString Singular; - public sbyte Adjective; - public SeString Plural; - public sbyte PossessivePronoun; - public sbyte StartsWithVowel; - public sbyte Unknown5; - public sbyte Pronoun; - public sbyte Article; - public LazyRow< ModelChara > Model; - public byte Scale; - public byte InactiveIdle0; - public byte InactiveIdle1; - public byte InactiveBattle; - public byte InactiveWandering; - public LazyRow< CompanionMove > Behavior; - public byte Special; - public byte WanderingWait; - public ushort Priority; - public bool Roulette; - public bool Unknown19; - public bool Battle; - public bool LookAt; - public bool Poke; - public ushort Enemy; - public bool Stroke; - public bool Clapping; - public ushort Icon; - public ushort Order; - public bool Unknown28; - public byte Unknown29; - public byte Cost; - public ushort HP; - public byte Unknown32; - public ushort SkillAngle; - public byte SkillCost; - public byte Unknown35; - public ushort Unknown36; - public LazyRow< MinionRace > MinionRace; + public SeString Singular { get; set; } + public sbyte Adjective { get; set; } + public SeString Plural { get; set; } + public sbyte PossessivePronoun { get; set; } + public sbyte StartsWithVowel { get; set; } + public sbyte Unknown5 { get; set; } + public sbyte Pronoun { get; set; } + public sbyte Article { get; set; } + public LazyRow< ModelChara > Model { get; set; } + public byte Scale { get; set; } + public byte InactiveIdle0 { get; set; } + public byte InactiveIdle1 { get; set; } + public byte InactiveBattle { get; set; } + public byte InactiveWandering { get; set; } + public LazyRow< CompanionMove > Behavior { get; set; } + public byte Special { get; set; } + public byte WanderingWait { get; set; } + public ushort Priority { get; set; } + public bool Roulette { get; set; } + public bool Unknown19 { get; set; } + public bool Battle { get; set; } + public bool LookAt { get; set; } + public bool Poke { get; set; } + public ushort Enemy { get; set; } + public bool Stroke { get; set; } + public bool Clapping { get; set; } + public ushort Icon { get; set; } + public ushort Order { get; set; } + public bool Unknown28 { get; set; } + public byte Unknown29 { get; set; } + public byte Cost { get; set; } + public ushort HP { get; set; } + public byte Unknown32 { get; set; } + public ushort SkillAngle { get; set; } + public byte SkillCost { get; set; } + public byte Unknown35 { get; set; } + public ushort Unknown36 { get; set; } + public LazyRow< MinionRace > MinionRace { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Singular = parser.ReadColumn< SeString >( 0 ); Adjective = parser.ReadColumn< sbyte >( 1 ); @@ -65,13 +61,13 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) Unknown5 = parser.ReadColumn< sbyte >( 5 ); Pronoun = parser.ReadColumn< sbyte >( 6 ); Article = parser.ReadColumn< sbyte >( 7 ); - Model = new LazyRow< ModelChara >( lumina, parser.ReadColumn< ushort >( 8 ), language ); + Model = new LazyRow< ModelChara >( gameData, parser.ReadColumn< ushort >( 8 ), language ); Scale = parser.ReadColumn< byte >( 9 ); InactiveIdle0 = parser.ReadColumn< byte >( 10 ); InactiveIdle1 = parser.ReadColumn< byte >( 11 ); InactiveBattle = parser.ReadColumn< byte >( 12 ); InactiveWandering = parser.ReadColumn< byte >( 13 ); - Behavior = new LazyRow< CompanionMove >( lumina, parser.ReadColumn< byte >( 14 ), language ); + Behavior = new LazyRow< CompanionMove >( gameData, parser.ReadColumn< byte >( 14 ), language ); Special = parser.ReadColumn< byte >( 15 ); WanderingWait = parser.ReadColumn< byte >( 16 ); Priority = parser.ReadColumn< ushort >( 17 ); @@ -94,7 +90,7 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) SkillCost = parser.ReadColumn< byte >( 34 ); Unknown35 = parser.ReadColumn< byte >( 35 ); Unknown36 = parser.ReadColumn< ushort >( 36 ); - MinionRace = new LazyRow< MinionRace >( lumina, parser.ReadColumn< byte >( 37 ), language ); + MinionRace = new LazyRow< MinionRace >( gameData, parser.ReadColumn< byte >( 37 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/CompanionMove.cs b/src/Lumina.Excel/GeneratedSheets/CompanionMove.cs index f26d2a09..cdd583e7 100644 --- a/src/Lumina.Excel/GeneratedSheets/CompanionMove.cs +++ b/src/Lumina.Excel/GeneratedSheets/CompanionMove.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "CompanionMove", columnHash: 0xdebb20e3 )] - public class CompanionMove : IExcelRow + public class CompanionMove : ExcelRow { - public SeString Name; + public SeString Name { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/CompanionTransient.cs b/src/Lumina.Excel/GeneratedSheets/CompanionTransient.cs index 94d064b4..127da069 100644 --- a/src/Lumina.Excel/GeneratedSheets/CompanionTransient.cs +++ b/src/Lumina.Excel/GeneratedSheets/CompanionTransient.cs @@ -7,31 +7,27 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "CompanionTransient", columnHash: 0xea0b06cf )] - public class CompanionTransient : IExcelRow + public class CompanionTransient : ExcelRow { - public SeString Description; - public SeString DescriptionEnhanced; - public SeString Tooltip; - public SeString SpecialActionName; - public SeString SpecialActionDescription; - public byte Attack; - public byte Defense; - public byte Speed; - public bool HasAreaAttack; - public bool StrengthGate; - public bool StrengthEye; - public bool StrengthShield; - public bool StrengthArcana; - public LazyRow< MinionSkillType > MinionSkillType; + public SeString Description { get; set; } + public SeString DescriptionEnhanced { get; set; } + public SeString Tooltip { get; set; } + public SeString SpecialActionName { get; set; } + public SeString SpecialActionDescription { get; set; } + public byte Attack { get; set; } + public byte Defense { get; set; } + public byte Speed { get; set; } + public bool HasAreaAttack { get; set; } + public bool StrengthGate { get; set; } + public bool StrengthEye { get; set; } + public bool StrengthShield { get; set; } + public bool StrengthArcana { get; set; } + public LazyRow< MinionSkillType > MinionSkillType { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Description = parser.ReadColumn< SeString >( 0 ); DescriptionEnhanced = parser.ReadColumn< SeString >( 1 ); @@ -46,7 +42,7 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) StrengthEye = parser.ReadColumn< bool >( 10 ); StrengthShield = parser.ReadColumn< bool >( 11 ); StrengthArcana = parser.ReadColumn< bool >( 12 ); - MinionSkillType = new LazyRow< MinionSkillType >( lumina, parser.ReadColumn< byte >( 13 ), language ); + MinionSkillType = new LazyRow< MinionSkillType >( gameData, parser.ReadColumn< byte >( 13 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/CompanyAction.cs b/src/Lumina.Excel/GeneratedSheets/CompanyAction.cs index 502bc743..ebd948d1 100644 --- a/src/Lumina.Excel/GeneratedSheets/CompanyAction.cs +++ b/src/Lumina.Excel/GeneratedSheets/CompanyAction.cs @@ -7,29 +7,25 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "CompanyAction", columnHash: 0xde0dd9cf )] - public class CompanyAction : IExcelRow + public class CompanyAction : ExcelRow { - public SeString Name; - public SeString Description; - public int Icon; - public LazyRow< FCRank > FCRank; - public uint Cost; - public byte Order; - public bool Purchasable; + public SeString Name { get; set; } + public SeString Description { get; set; } + public int Icon { get; set; } + public LazyRow< FCRank > FCRank { get; set; } + public uint Cost { get; set; } + public byte Order { get; set; } + public bool Purchasable { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); Description = parser.ReadColumn< SeString >( 1 ); Icon = parser.ReadColumn< int >( 2 ); - FCRank = new LazyRow< FCRank >( lumina, parser.ReadColumn< byte >( 3 ), language ); + FCRank = new LazyRow< FCRank >( gameData, parser.ReadColumn< byte >( 3 ), language ); Cost = parser.ReadColumn< uint >( 4 ); Order = parser.ReadColumn< byte >( 5 ); Purchasable = parser.ReadColumn< bool >( 6 ); diff --git a/src/Lumina.Excel/GeneratedSheets/CompanyCraftDraft.cs b/src/Lumina.Excel/GeneratedSheets/CompanyCraftDraft.cs index 720303cc..9006868c 100644 --- a/src/Lumina.Excel/GeneratedSheets/CompanyCraftDraft.cs +++ b/src/Lumina.Excel/GeneratedSheets/CompanyCraftDraft.cs @@ -7,7 +7,7 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "CompanyCraftDraft", columnHash: 0xdf938294 )] - public class CompanyCraftDraft : IExcelRow + public class CompanyCraftDraft : ExcelRow { public struct UnkStruct2Struct { @@ -15,21 +15,17 @@ public struct UnkStruct2Struct public byte RequiredItemCount; } - public SeString Name; - public LazyRow< CompanyCraftDraftCategory > CompanyCraftDraftCategory; - public UnkStruct2Struct[] UnkStruct2; - public uint Order; + public SeString Name { get; set; } + public LazyRow< CompanyCraftDraftCategory > CompanyCraftDraftCategory { get; set; } + public UnkStruct2Struct[] UnkStruct2 { get; set; } + public uint Order { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); - CompanyCraftDraftCategory = new LazyRow< CompanyCraftDraftCategory >( lumina, parser.ReadColumn< byte >( 1 ), language ); + CompanyCraftDraftCategory = new LazyRow< CompanyCraftDraftCategory >( gameData, parser.ReadColumn< byte >( 1 ), language ); UnkStruct2 = new UnkStruct2Struct[ 3 ]; for( var i = 0; i < 3; i++ ) { diff --git a/src/Lumina.Excel/GeneratedSheets/CompanyCraftDraftCategory.cs b/src/Lumina.Excel/GeneratedSheets/CompanyCraftDraftCategory.cs index 0322fa94..60420fb9 100644 --- a/src/Lumina.Excel/GeneratedSheets/CompanyCraftDraftCategory.cs +++ b/src/Lumina.Excel/GeneratedSheets/CompanyCraftDraftCategory.cs @@ -7,23 +7,19 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "CompanyCraftDraftCategory", columnHash: 0xf6570594 )] - public class CompanyCraftDraftCategory : IExcelRow + public class CompanyCraftDraftCategory : ExcelRow { public struct UnkStruct1Struct { public ushort CompanyCraftType; } - public SeString Name; - public UnkStruct1Struct[] UnkStruct1; + public SeString Name { get; set; } + public UnkStruct1Struct[] UnkStruct1 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); UnkStruct1 = new UnkStruct1Struct[ 10 ]; diff --git a/src/Lumina.Excel/GeneratedSheets/CompanyCraftManufactoryState.cs b/src/Lumina.Excel/GeneratedSheets/CompanyCraftManufactoryState.cs index f198c5cd..8acb75c5 100644 --- a/src/Lumina.Excel/GeneratedSheets/CompanyCraftManufactoryState.cs +++ b/src/Lumina.Excel/GeneratedSheets/CompanyCraftManufactoryState.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "CompanyCraftManufactoryState", columnHash: 0xdebb20e3 )] - public class CompanyCraftManufactoryState : IExcelRow + public class CompanyCraftManufactoryState : ExcelRow { - public SeString Name; + public SeString Name { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/CompanyCraftPart.cs b/src/Lumina.Excel/GeneratedSheets/CompanyCraftPart.cs index 37001636..aa1c7cdb 100644 --- a/src/Lumina.Excel/GeneratedSheets/CompanyCraftPart.cs +++ b/src/Lumina.Excel/GeneratedSheets/CompanyCraftPart.cs @@ -7,27 +7,23 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "CompanyCraftPart", columnHash: 0xe9ffd316 )] - public class CompanyCraftPart : IExcelRow + public class CompanyCraftPart : ExcelRow { - public byte Unknown0; - public LazyRow< CompanyCraftType > CompanyCraftType; - public LazyRow< CompanyCraftProcess >[] CompanyCraftProcess; - public ushort Unknown5; + public byte Unknown0 { get; set; } + public LazyRow< CompanyCraftType > CompanyCraftType { get; set; } + public LazyRow< CompanyCraftProcess >[] CompanyCraftProcess { get; set; } + public ushort Unknown5 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< byte >( 0 ); - CompanyCraftType = new LazyRow< CompanyCraftType >( lumina, parser.ReadColumn< byte >( 1 ), language ); + CompanyCraftType = new LazyRow< CompanyCraftType >( gameData, parser.ReadColumn< byte >( 1 ), language ); CompanyCraftProcess = new LazyRow< CompanyCraftProcess >[ 3 ]; for( var i = 0; i < 3; i++ ) - CompanyCraftProcess[ i ] = new LazyRow< CompanyCraftProcess >( lumina, parser.ReadColumn< ushort >( 2 + i ), language ); + CompanyCraftProcess[ i ] = new LazyRow< CompanyCraftProcess >( gameData, parser.ReadColumn< ushort >( 2 + i ), language ); Unknown5 = parser.ReadColumn< ushort >( 5 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/CompanyCraftProcess.cs b/src/Lumina.Excel/GeneratedSheets/CompanyCraftProcess.cs index f1c5bc84..c5b96c61 100644 --- a/src/Lumina.Excel/GeneratedSheets/CompanyCraftProcess.cs +++ b/src/Lumina.Excel/GeneratedSheets/CompanyCraftProcess.cs @@ -7,7 +7,7 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "CompanyCraftProcess", columnHash: 0x3135b48e )] - public class CompanyCraftProcess : IExcelRow + public class CompanyCraftProcess : ExcelRow { public struct UnkStruct0Struct { @@ -16,15 +16,11 @@ public struct UnkStruct0Struct public ushort SetsRequired; } - public UnkStruct0Struct[] UnkStruct0; + public UnkStruct0Struct[] UnkStruct0 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); UnkStruct0 = new UnkStruct0Struct[ 12 ]; for( var i = 0; i < 12; i++ ) diff --git a/src/Lumina.Excel/GeneratedSheets/CompanyCraftSequence.cs b/src/Lumina.Excel/GeneratedSheets/CompanyCraftSequence.cs index c98f7a20..f958bf41 100644 --- a/src/Lumina.Excel/GeneratedSheets/CompanyCraftSequence.cs +++ b/src/Lumina.Excel/GeneratedSheets/CompanyCraftSequence.cs @@ -7,33 +7,29 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "CompanyCraftSequence", columnHash: 0x6d444cc1 )] - public class CompanyCraftSequence : IExcelRow + public class CompanyCraftSequence : ExcelRow { - public LazyRow< Item > ResultItem; - public int Category; - public LazyRow< CompanyCraftDraftCategory > CompanyCraftDraftCategory; - public LazyRow< CompanyCraftType > CompanyCraftType; - public LazyRow< CompanyCraftDraft > CompanyCraftDraft; - public LazyRow< CompanyCraftPart >[] CompanyCraftPart; - public uint Order; + public LazyRow< Item > ResultItem { get; set; } + public int Category { get; set; } + public LazyRow< CompanyCraftDraftCategory > CompanyCraftDraftCategory { get; set; } + public LazyRow< CompanyCraftType > CompanyCraftType { get; set; } + public LazyRow< CompanyCraftDraft > CompanyCraftDraft { get; set; } + public LazyRow< CompanyCraftPart >[] CompanyCraftPart { get; set; } + public uint Order { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - ResultItem = new LazyRow< Item >( lumina, parser.ReadColumn< int >( 0 ), language ); + ResultItem = new LazyRow< Item >( gameData, parser.ReadColumn< int >( 0 ), language ); Category = parser.ReadColumn< int >( 1 ); - CompanyCraftDraftCategory = new LazyRow< CompanyCraftDraftCategory >( lumina, parser.ReadColumn< int >( 2 ), language ); - CompanyCraftType = new LazyRow< CompanyCraftType >( lumina, parser.ReadColumn< int >( 3 ), language ); - CompanyCraftDraft = new LazyRow< CompanyCraftDraft >( lumina, parser.ReadColumn< int >( 4 ), language ); + CompanyCraftDraftCategory = new LazyRow< CompanyCraftDraftCategory >( gameData, parser.ReadColumn< int >( 2 ), language ); + CompanyCraftType = new LazyRow< CompanyCraftType >( gameData, parser.ReadColumn< int >( 3 ), language ); + CompanyCraftDraft = new LazyRow< CompanyCraftDraft >( gameData, parser.ReadColumn< int >( 4 ), language ); CompanyCraftPart = new LazyRow< CompanyCraftPart >[ 8 ]; for( var i = 0; i < 8; i++ ) - CompanyCraftPart[ i ] = new LazyRow< CompanyCraftPart >( lumina, parser.ReadColumn< ushort >( 5 + i ), language ); + CompanyCraftPart[ i ] = new LazyRow< CompanyCraftPart >( gameData, parser.ReadColumn< ushort >( 5 + i ), language ); Order = parser.ReadColumn< uint >( 13 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/CompanyCraftSupplyItem.cs b/src/Lumina.Excel/GeneratedSheets/CompanyCraftSupplyItem.cs index 676b4e95..9db4739e 100644 --- a/src/Lumina.Excel/GeneratedSheets/CompanyCraftSupplyItem.cs +++ b/src/Lumina.Excel/GeneratedSheets/CompanyCraftSupplyItem.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "CompanyCraftSupplyItem", columnHash: 0xdbf43666 )] - public class CompanyCraftSupplyItem : IExcelRow + public class CompanyCraftSupplyItem : ExcelRow { - public LazyRow< Item > Item; + public LazyRow< Item > Item { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Item = new LazyRow< Item >( lumina, parser.ReadColumn< uint >( 0 ), language ); + Item = new LazyRow< Item >( gameData, parser.ReadColumn< uint >( 0 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/CompanyCraftType.cs b/src/Lumina.Excel/GeneratedSheets/CompanyCraftType.cs index 9f44b3a6..eebe7396 100644 --- a/src/Lumina.Excel/GeneratedSheets/CompanyCraftType.cs +++ b/src/Lumina.Excel/GeneratedSheets/CompanyCraftType.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "CompanyCraftType", columnHash: 0xdebb20e3 )] - public class CompanyCraftType : IExcelRow + public class CompanyCraftType : ExcelRow { - public SeString Name; + public SeString Name { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/CompanyLeve.cs b/src/Lumina.Excel/GeneratedSheets/CompanyLeve.cs index e8e2f759..a152c133 100644 --- a/src/Lumina.Excel/GeneratedSheets/CompanyLeve.cs +++ b/src/Lumina.Excel/GeneratedSheets/CompanyLeve.cs @@ -7,7 +7,7 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "CompanyLeve", columnHash: 0x688cf3da )] - public class CompanyLeve : IExcelRow + public class CompanyLeve : ExcelRow { public struct UnkStruct56Struct { @@ -18,124 +18,120 @@ public struct UnkStruct104Struct public byte NumOfAppearance; } - public ushort[] RoutePointTime; - public int[] BaseID; - public ushort[] EnemyLevel; - public LazyRow< BNpcName >[] BNpcName; - public LazyRow< EventItem >[] ItemsInvolved; - public byte[] ItemsInvolvedQty; - public byte[] ItemDropRate; - public UnkStruct56Struct[] UnkStruct56; - public uint Unknown62; - public uint Unknown63; - public uint Unknown64; - public uint Unknown65; - public uint Unknown66; - public uint Unknown67; - public uint Unknown68; - public uint Unknown69; - public uint Unknown70; - public uint Unknown71; - public uint Unknown72; - public uint Unknown73; - public uint Unknown74; - public uint Unknown75; - public uint Unknown76; - public uint Unknown77; - public uint Unknown78; - public uint Unknown79; - public uint Unknown80; - public uint Unknown81; - public uint Unknown82; - public uint Unknown83; - public uint Unknown84; - public uint Unknown85; - public uint Unknown86; - public uint Unknown87; - public uint Unknown88; - public uint Unknown89; - public uint Unknown90; - public uint Unknown91; - public uint Unknown92; - public uint Unknown93; - public uint Unknown94; - public uint Unknown95; - public uint Unknown96; - public uint Unknown97; - public uint Unknown98; - public uint Unknown99; - public uint Unknown100; - public uint Unknown101; - public uint Unknown102; - public uint Unknown103; - public UnkStruct104Struct[] UnkStruct104; - public byte Unknown112; - public byte Unknown113; - public byte Unknown114; - public byte Unknown115; - public byte Unknown116; - public byte Unknown117; - public byte Unknown118; - public byte Unknown119; - public byte Unknown120; - public byte Unknown121; - public byte Unknown122; - public byte Unknown123; - public byte Unknown124; - public byte Unknown125; - public byte Unknown126; - public byte Unknown127; - public byte Unknown128; - public byte Unknown129; - public byte Unknown130; - public byte Unknown131; - public byte Unknown132; - public byte Unknown133; - public byte Unknown134; - public byte Unknown135; - public byte Unknown136; - public byte Unknown137; - public byte Unknown138; - public byte Unknown139; - public byte Unknown140; - public byte Unknown141; - public byte Unknown142; - public byte Unknown143; - public byte Unknown144; - public byte Unknown145; - public byte Unknown146; - public byte Unknown147; - public byte Unknown148; - public byte Unknown149; - public byte Unknown150; - public byte Unknown151; - public byte Unknown152; - public byte Unknown153; - public byte Unknown154; - public byte Unknown155; - public byte Unknown156; - public byte Unknown157; - public byte Unknown158; - public byte Unknown159; - public byte Unknown160; - public byte Unknown161; - public byte Unknown162; - public byte Unknown163; - public byte Unknown164; - public byte Unknown165; - public byte Unknown166; - public byte Unknown167; - public byte[] ToDoSequence; - public LazyRow< CompanyLeveRule > Rule; - public byte RuleParam; + public ushort[] RoutePointTime { get; set; } + public int[] BaseID { get; set; } + public ushort[] EnemyLevel { get; set; } + public LazyRow< BNpcName >[] BNpcName { get; set; } + public LazyRow< EventItem >[] ItemsInvolved { get; set; } + public byte[] ItemsInvolvedQty { get; set; } + public byte[] ItemDropRate { get; set; } + public UnkStruct56Struct[] UnkStruct56 { get; set; } + public uint Unknown62 { get; set; } + public uint Unknown63 { get; set; } + public uint Unknown64 { get; set; } + public uint Unknown65 { get; set; } + public uint Unknown66 { get; set; } + public uint Unknown67 { get; set; } + public uint Unknown68 { get; set; } + public uint Unknown69 { get; set; } + public uint Unknown70 { get; set; } + public uint Unknown71 { get; set; } + public uint Unknown72 { get; set; } + public uint Unknown73 { get; set; } + public uint Unknown74 { get; set; } + public uint Unknown75 { get; set; } + public uint Unknown76 { get; set; } + public uint Unknown77 { get; set; } + public uint Unknown78 { get; set; } + public uint Unknown79 { get; set; } + public uint Unknown80 { get; set; } + public uint Unknown81 { get; set; } + public uint Unknown82 { get; set; } + public uint Unknown83 { get; set; } + public uint Unknown84 { get; set; } + public uint Unknown85 { get; set; } + public uint Unknown86 { get; set; } + public uint Unknown87 { get; set; } + public uint Unknown88 { get; set; } + public uint Unknown89 { get; set; } + public uint Unknown90 { get; set; } + public uint Unknown91 { get; set; } + public uint Unknown92 { get; set; } + public uint Unknown93 { get; set; } + public uint Unknown94 { get; set; } + public uint Unknown95 { get; set; } + public uint Unknown96 { get; set; } + public uint Unknown97 { get; set; } + public uint Unknown98 { get; set; } + public uint Unknown99 { get; set; } + public uint Unknown100 { get; set; } + public uint Unknown101 { get; set; } + public uint Unknown102 { get; set; } + public uint Unknown103 { get; set; } + public UnkStruct104Struct[] UnkStruct104 { get; set; } + public byte Unknown112 { get; set; } + public byte Unknown113 { get; set; } + public byte Unknown114 { get; set; } + public byte Unknown115 { get; set; } + public byte Unknown116 { get; set; } + public byte Unknown117 { get; set; } + public byte Unknown118 { get; set; } + public byte Unknown119 { get; set; } + public byte Unknown120 { get; set; } + public byte Unknown121 { get; set; } + public byte Unknown122 { get; set; } + public byte Unknown123 { get; set; } + public byte Unknown124 { get; set; } + public byte Unknown125 { get; set; } + public byte Unknown126 { get; set; } + public byte Unknown127 { get; set; } + public byte Unknown128 { get; set; } + public byte Unknown129 { get; set; } + public byte Unknown130 { get; set; } + public byte Unknown131 { get; set; } + public byte Unknown132 { get; set; } + public byte Unknown133 { get; set; } + public byte Unknown134 { get; set; } + public byte Unknown135 { get; set; } + public byte Unknown136 { get; set; } + public byte Unknown137 { get; set; } + public byte Unknown138 { get; set; } + public byte Unknown139 { get; set; } + public byte Unknown140 { get; set; } + public byte Unknown141 { get; set; } + public byte Unknown142 { get; set; } + public byte Unknown143 { get; set; } + public byte Unknown144 { get; set; } + public byte Unknown145 { get; set; } + public byte Unknown146 { get; set; } + public byte Unknown147 { get; set; } + public byte Unknown148 { get; set; } + public byte Unknown149 { get; set; } + public byte Unknown150 { get; set; } + public byte Unknown151 { get; set; } + public byte Unknown152 { get; set; } + public byte Unknown153 { get; set; } + public byte Unknown154 { get; set; } + public byte Unknown155 { get; set; } + public byte Unknown156 { get; set; } + public byte Unknown157 { get; set; } + public byte Unknown158 { get; set; } + public byte Unknown159 { get; set; } + public byte Unknown160 { get; set; } + public byte Unknown161 { get; set; } + public byte Unknown162 { get; set; } + public byte Unknown163 { get; set; } + public byte Unknown164 { get; set; } + public byte Unknown165 { get; set; } + public byte Unknown166 { get; set; } + public byte Unknown167 { get; set; } + public byte[] ToDoSequence { get; set; } + public LazyRow< CompanyLeveRule > Rule { get; set; } + public byte RuleParam { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); RoutePointTime = new ushort[ 8 ]; for( var i = 0; i < 8; i++ ) @@ -148,10 +144,10 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) EnemyLevel[ i ] = parser.ReadColumn< ushort >( 16 + i ); BNpcName = new LazyRow< BNpcName >[ 8 ]; for( var i = 0; i < 8; i++ ) - BNpcName[ i ] = new LazyRow< BNpcName >( lumina, parser.ReadColumn< uint >( 24 + i ), language ); + BNpcName[ i ] = new LazyRow< BNpcName >( gameData, parser.ReadColumn< uint >( 24 + i ), language ); ItemsInvolved = new LazyRow< EventItem >[ 8 ]; for( var i = 0; i < 8; i++ ) - ItemsInvolved[ i ] = new LazyRow< EventItem >( lumina, parser.ReadColumn< int >( 32 + i ), language ); + ItemsInvolved[ i ] = new LazyRow< EventItem >( gameData, parser.ReadColumn< int >( 32 + i ), language ); ItemsInvolvedQty = new byte[ 8 ]; for( var i = 0; i < 8; i++ ) ItemsInvolvedQty[ i ] = parser.ReadColumn< byte >( 40 + i ); @@ -271,7 +267,7 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) ToDoSequence = new byte[ 8 ]; for( var i = 0; i < 8; i++ ) ToDoSequence[ i ] = parser.ReadColumn< byte >( 168 + i ); - Rule = new LazyRow< CompanyLeveRule >( lumina, parser.ReadColumn< int >( 176 ), language ); + Rule = new LazyRow< CompanyLeveRule >( gameData, parser.ReadColumn< int >( 176 ), language ); RuleParam = parser.ReadColumn< byte >( 177 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/CompanyLeveRule.cs b/src/Lumina.Excel/GeneratedSheets/CompanyLeveRule.cs index 7fbf53c5..f6a06d2a 100644 --- a/src/Lumina.Excel/GeneratedSheets/CompanyLeveRule.cs +++ b/src/Lumina.Excel/GeneratedSheets/CompanyLeveRule.cs @@ -7,24 +7,20 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "CompanyLeveRule", columnHash: 0xcc3ad729 )] - public class CompanyLeveRule : IExcelRow + public class CompanyLeveRule : ExcelRow { - public SeString Type; - public LazyRow< LeveString > Objective; - public LazyRow< LeveString > Help; + public SeString Type { get; set; } + public LazyRow< LeveString > Objective { get; set; } + public LazyRow< LeveString > Help { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Type = parser.ReadColumn< SeString >( 0 ); - Objective = new LazyRow< LeveString >( lumina, parser.ReadColumn< ushort >( 1 ), language ); - Help = new LazyRow< LeveString >( lumina, parser.ReadColumn< ushort >( 2 ), language ); + Objective = new LazyRow< LeveString >( gameData, parser.ReadColumn< ushort >( 1 ), language ); + Help = new LazyRow< LeveString >( gameData, parser.ReadColumn< ushort >( 2 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/CompleteJournal.cs b/src/Lumina.Excel/GeneratedSheets/CompleteJournal.cs index f73ae752..62bfc830 100644 --- a/src/Lumina.Excel/GeneratedSheets/CompleteJournal.cs +++ b/src/Lumina.Excel/GeneratedSheets/CompleteJournal.cs @@ -7,24 +7,20 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "CompleteJournal", columnHash: 0x8741e36a )] - public class CompleteJournal : IExcelRow + public class CompleteJournal : ExcelRow { - public uint Unknown0; - public ushort RequiredLevel; - public byte Unknown2; - public int Icon; - public uint Unknown4; - public SeString Name; - public LazyRow< Cutscene >[] Cutscene; + public uint Unknown0 { get; set; } + public ushort RequiredLevel { get; set; } + public byte Unknown2 { get; set; } + public int Icon { get; set; } + public uint Unknown4 { get; set; } + public SeString Name { get; set; } + public LazyRow< Cutscene >[] Cutscene { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< uint >( 0 ); RequiredLevel = parser.ReadColumn< ushort >( 1 ); @@ -34,7 +30,7 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) Name = parser.ReadColumn< SeString >( 5 ); Cutscene = new LazyRow< Cutscene >[ 24 ]; for( var i = 0; i < 24; i++ ) - Cutscene[ i ] = new LazyRow< Cutscene >( lumina, parser.ReadColumn< int >( 6 + i ), language ); + Cutscene[ i ] = new LazyRow< Cutscene >( gameData, parser.ReadColumn< int >( 6 + i ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/CompleteJournalCategory.cs b/src/Lumina.Excel/GeneratedSheets/CompleteJournalCategory.cs index de710d23..eef398ef 100644 --- a/src/Lumina.Excel/GeneratedSheets/CompleteJournalCategory.cs +++ b/src/Lumina.Excel/GeneratedSheets/CompleteJournalCategory.cs @@ -7,23 +7,19 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "CompleteJournalCategory", columnHash: 0x976040dd )] - public class CompleteJournalCategory : IExcelRow + public class CompleteJournalCategory : ExcelRow { - public LazyRow< CompleteJournal > FirstQuest; - public LazyRow< CompleteJournal > LastQuest; - public int Unknown2; + public LazyRow< CompleteJournal > FirstQuest { get; set; } + public LazyRow< CompleteJournal > LastQuest { get; set; } + public int Unknown2 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - FirstQuest = new LazyRow< CompleteJournal >( lumina, parser.ReadColumn< uint >( 0 ), language ); - LastQuest = new LazyRow< CompleteJournal >( lumina, parser.ReadColumn< uint >( 1 ), language ); + FirstQuest = new LazyRow< CompleteJournal >( gameData, parser.ReadColumn< uint >( 0 ), language ); + LastQuest = new LazyRow< CompleteJournal >( gameData, parser.ReadColumn< uint >( 1 ), language ); Unknown2 = parser.ReadColumn< int >( 2 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/Condition.cs b/src/Lumina.Excel/GeneratedSheets/Condition.cs index ddbfcd60..cafa197a 100644 --- a/src/Lumina.Excel/GeneratedSheets/Condition.cs +++ b/src/Lumina.Excel/GeneratedSheets/Condition.cs @@ -7,25 +7,21 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Condition", columnHash: 0xf234a002 )] - public class Condition : IExcelRow + public class Condition : ExcelRow { - public bool Unknown0; - public byte Unknown1; - public LazyRow< LogMessage > LogMessage; - public byte Unknown3; + public bool Unknown0 { get; set; } + public byte Unknown1 { get; set; } + public LazyRow< LogMessage > LogMessage { get; set; } + public byte Unknown3 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< bool >( 0 ); Unknown1 = parser.ReadColumn< byte >( 1 ); - LogMessage = new LazyRow< LogMessage >( lumina, parser.ReadColumn< uint >( 2 ), language ); + LogMessage = new LazyRow< LogMessage >( gameData, parser.ReadColumn< uint >( 2 ), language ); Unknown3 = parser.ReadColumn< byte >( 3 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/ConfigKey.cs b/src/Lumina.Excel/GeneratedSheets/ConfigKey.cs index 9aa4c4cc..37e99bb7 100644 --- a/src/Lumina.Excel/GeneratedSheets/ConfigKey.cs +++ b/src/Lumina.Excel/GeneratedSheets/ConfigKey.cs @@ -7,25 +7,21 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ConfigKey", columnHash: 0x927ebfb7 )] - public class ConfigKey : IExcelRow + public class ConfigKey : ExcelRow { - public SeString Label; - public byte Param; - public byte Platform; - public bool Required; - public byte Category; - public ushort Unknown5; - public byte Unknown6; - public SeString Text; + public SeString Label { get; set; } + public byte Param { get; set; } + public byte Platform { get; set; } + public bool Required { get; set; } + public byte Category { get; set; } + public ushort Unknown5 { get; set; } + public byte Unknown6 { get; set; } + public SeString Text { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Label = parser.ReadColumn< SeString >( 0 ); Param = parser.ReadColumn< byte >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/ContentCloseCycle.cs b/src/Lumina.Excel/GeneratedSheets/ContentCloseCycle.cs index d8c46d93..c04d2833 100644 --- a/src/Lumina.Excel/GeneratedSheets/ContentCloseCycle.cs +++ b/src/Lumina.Excel/GeneratedSheets/ContentCloseCycle.cs @@ -7,30 +7,26 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ContentCloseCycle", columnHash: 0xd3032cdb )] - public class ContentCloseCycle : IExcelRow + public class ContentCloseCycle : ExcelRow { - public uint Unixtime; - public uint TimeSeconds; - public uint Unknown2; - public bool Unknown3; - public bool Unknown4; - public bool Unknown5; - public bool Unknown6; - public bool Unknown7; - public bool Unknown8; - public bool Unknown9; - public bool Unknown10; - public bool Unknown11; - public bool Unknown12; + public uint Unixtime { get; set; } + public uint TimeSeconds { get; set; } + public uint Unknown2 { get; set; } + public bool Unknown3 { get; set; } + public bool Unknown4 { get; set; } + public bool Unknown5 { get; set; } + public bool Unknown6 { get; set; } + public bool Unknown7 { get; set; } + public bool Unknown8 { get; set; } + public bool Unknown9 { get; set; } + public bool Unknown10 { get; set; } + public bool Unknown11 { get; set; } + public bool Unknown12 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unixtime = parser.ReadColumn< uint >( 0 ); TimeSeconds = parser.ReadColumn< uint >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/ContentExAction.cs b/src/Lumina.Excel/GeneratedSheets/ContentExAction.cs index e10371b0..9ee77850 100644 --- a/src/Lumina.Excel/GeneratedSheets/ContentExAction.cs +++ b/src/Lumina.Excel/GeneratedSheets/ContentExAction.cs @@ -7,23 +7,19 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ContentExAction", columnHash: 0x8690a89e )] - public class ContentExAction : IExcelRow + public class ContentExAction : ExcelRow { - public LazyRow< Action > Name; - public uint Unknown1; - public byte Charges; - public byte Unknown3; + public LazyRow< Action > Name { get; set; } + public uint Unknown1 { get; set; } + public byte Charges { get; set; } + public byte Unknown3 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Name = new LazyRow< Action >( lumina, parser.ReadColumn< uint >( 0 ), language ); + Name = new LazyRow< Action >( gameData, parser.ReadColumn< uint >( 0 ), language ); Unknown1 = parser.ReadColumn< uint >( 1 ); Charges = parser.ReadColumn< byte >( 2 ); Unknown3 = parser.ReadColumn< byte >( 3 ); diff --git a/src/Lumina.Excel/GeneratedSheets/ContentFinderCondition.cs b/src/Lumina.Excel/GeneratedSheets/ContentFinderCondition.cs index ba32be09..af3eb524 100644 --- a/src/Lumina.Excel/GeneratedSheets/ContentFinderCondition.cs +++ b/src/Lumina.Excel/GeneratedSheets/ContentFinderCondition.cs @@ -7,116 +7,112 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ContentFinderCondition", columnHash: 0x5d623828 )] - public class ContentFinderCondition : IExcelRow + public class ContentFinderCondition : ExcelRow { - public SeString ShortCode; - public LazyRow< TerritoryType > TerritoryType; - public byte ContentLinkType; - public ushort Content; - public bool PvP; - public byte Unknown5; - public uint Unknown6; - public uint Unknown7; - public LazyRow< ClassJobCategory > AcceptClassJobCategory; - public LazyRow< ContentMemberType > ContentMemberType; - public byte Unknown10; - public byte Unknown11; - public byte Unknown12; - public LazyRow< Quest > UnlockQuest; - public ushort Unknown14; - public byte ClassJobLevelRequired; - public byte ClassJobLevelSync; - public ushort ItemLevelRequired; - public ushort ItemLevelSync; - public bool AddedIn53; - public bool AllowUndersized; - public bool AllowReplacement; - public bool Unknown22; - public bool Unknown23; - public bool Unknown24; - public bool Unknown25; - public byte Unknown26; - public bool Unknown27; - public bool HighEndDuty; - public bool Unknown29; - public bool Unknown30; - public bool Unknown31; - public bool DutyRecorderAllowed; - public bool Unknown33; - public bool Unknown34; - public bool Unknown35; - public bool Unknown36; - public SeString Name; - public LazyRow< ContentType > ContentType; - public byte TransientKey; - public uint Transient; - public ushort SortKey; - public uint Image; - public uint Icon; - public sbyte Unknown44; - public bool LevelingRoulette; - public bool Level5060Roulette; - public bool MSQRoulette; - public bool GuildHestRoulette; - public bool ExpertRoulette; - public bool TrialRoulette; - public bool DailyFrontlineChallenge; - public bool Level70Roulette; - public bool MentorRoulette; - public bool Unknown54; - public bool Unknown55; - public bool Unknown56; - public bool Unknown57; - public bool Unknown58; - public bool AllianceRoulette; - public bool Unknown60; - public bool NormalRaidRoulette; - public bool Unknown62; - public bool Unknown63; - public bool Unknown64; - public bool Unknown65; - public bool Unknown66; - public bool Unknown67; - public bool Unknown68; - public bool Unknown69; - public bool Unknown70; - public bool Unknown71; - public bool Unknown72; - public bool Unknown73; - public bool Unknown74; - public bool Unknown75; - public bool Unknown76; - public bool Unknown77; - public bool Unknown78; - public bool Unknown79; - public bool Unknown80; - public bool Unknown81; - public bool Unknown82; - public bool Unknown83; + public SeString ShortCode { get; set; } + public LazyRow< TerritoryType > TerritoryType { get; set; } + public byte ContentLinkType { get; set; } + public ushort Content { get; set; } + public bool PvP { get; set; } + public byte Unknown5 { get; set; } + public uint Unknown6 { get; set; } + public uint Unknown7 { get; set; } + public LazyRow< ClassJobCategory > AcceptClassJobCategory { get; set; } + public LazyRow< ContentMemberType > ContentMemberType { get; set; } + public byte Unknown10 { get; set; } + public byte Unknown11 { get; set; } + public byte Unknown12 { get; set; } + public LazyRow< Quest > UnlockQuest { get; set; } + public ushort Unknown14 { get; set; } + public byte ClassJobLevelRequired { get; set; } + public byte ClassJobLevelSync { get; set; } + public ushort ItemLevelRequired { get; set; } + public ushort ItemLevelSync { get; set; } + public bool AddedIn53 { get; set; } + public bool AllowUndersized { get; set; } + public bool AllowReplacement { get; set; } + public bool Unknown22 { get; set; } + public bool AllowExplorerMode { get; set; } + public bool Unknown24 { get; set; } + public bool Unknown25 { get; set; } + public byte Unknown26 { get; set; } + public bool Unknown27 { get; set; } + public bool HighEndDuty { get; set; } + public bool Unknown29 { get; set; } + public bool Unknown30 { get; set; } + public bool Unknown31 { get; set; } + public bool DutyRecorderAllowed { get; set; } + public bool Unknown33 { get; set; } + public bool Unknown34 { get; set; } + public bool Unknown35 { get; set; } + public bool Unknown36 { get; set; } + public SeString Name { get; set; } + public LazyRow< ContentType > ContentType { get; set; } + public byte TransientKey { get; set; } + public uint Transient { get; set; } + public ushort SortKey { get; set; } + public uint Image { get; set; } + public uint Icon { get; set; } + public sbyte Unknown44 { get; set; } + public bool LevelingRoulette { get; set; } + public bool Level506070Roulette { get; set; } + public bool MSQRoulette { get; set; } + public bool GuildHestRoulette { get; set; } + public bool ExpertRoulette { get; set; } + public bool TrialRoulette { get; set; } + public bool DailyFrontlineChallenge { get; set; } + public bool Level80Roulette { get; set; } + public bool MentorRoulette { get; set; } + public bool Unknown54 { get; set; } + public bool Unknown55 { get; set; } + public bool Unknown56 { get; set; } + public bool Unknown57 { get; set; } + public bool Unknown58 { get; set; } + public bool AllianceRoulette { get; set; } + public bool Unknown60 { get; set; } + public bool NormalRaidRoulette { get; set; } + public bool Unknown62 { get; set; } + public bool Unknown63 { get; set; } + public bool Unknown64 { get; set; } + public bool Unknown65 { get; set; } + public bool Unknown66 { get; set; } + public bool Unknown67 { get; set; } + public bool Unknown68 { get; set; } + public bool Unknown69 { get; set; } + public bool Unknown70 { get; set; } + public bool Unknown71 { get; set; } + public bool Unknown72 { get; set; } + public bool Unknown73 { get; set; } + public bool Unknown74 { get; set; } + public bool Unknown75 { get; set; } + public bool Unknown76 { get; set; } + public bool Unknown77 { get; set; } + public bool Unknown78 { get; set; } + public bool Unknown79 { get; set; } + public bool Unknown80 { get; set; } + public bool Unknown81 { get; set; } + public bool Unknown82 { get; set; } + public bool Unknown83 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); ShortCode = parser.ReadColumn< SeString >( 0 ); - TerritoryType = new LazyRow< TerritoryType >( lumina, parser.ReadColumn< ushort >( 1 ), language ); + TerritoryType = new LazyRow< TerritoryType >( gameData, parser.ReadColumn< ushort >( 1 ), language ); ContentLinkType = parser.ReadColumn< byte >( 2 ); Content = parser.ReadColumn< ushort >( 3 ); PvP = parser.ReadColumn< bool >( 4 ); Unknown5 = parser.ReadColumn< byte >( 5 ); Unknown6 = parser.ReadColumn< uint >( 6 ); Unknown7 = parser.ReadColumn< uint >( 7 ); - AcceptClassJobCategory = new LazyRow< ClassJobCategory >( lumina, parser.ReadColumn< byte >( 8 ), language ); - ContentMemberType = new LazyRow< ContentMemberType >( lumina, parser.ReadColumn< byte >( 9 ), language ); + AcceptClassJobCategory = new LazyRow< ClassJobCategory >( gameData, parser.ReadColumn< byte >( 8 ), language ); + ContentMemberType = new LazyRow< ContentMemberType >( gameData, parser.ReadColumn< byte >( 9 ), language ); Unknown10 = parser.ReadColumn< byte >( 10 ); Unknown11 = parser.ReadColumn< byte >( 11 ); Unknown12 = parser.ReadColumn< byte >( 12 ); - UnlockQuest = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 13 ), language ); + UnlockQuest = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 13 ), language ); Unknown14 = parser.ReadColumn< ushort >( 14 ); ClassJobLevelRequired = parser.ReadColumn< byte >( 15 ); ClassJobLevelSync = parser.ReadColumn< byte >( 16 ); @@ -126,7 +122,7 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) AllowUndersized = parser.ReadColumn< bool >( 20 ); AllowReplacement = parser.ReadColumn< bool >( 21 ); Unknown22 = parser.ReadColumn< bool >( 22 ); - Unknown23 = parser.ReadColumn< bool >( 23 ); + AllowExplorerMode = parser.ReadColumn< bool >( 23 ); Unknown24 = parser.ReadColumn< bool >( 24 ); Unknown25 = parser.ReadColumn< bool >( 25 ); Unknown26 = parser.ReadColumn< byte >( 26 ); @@ -141,7 +137,7 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) Unknown35 = parser.ReadColumn< bool >( 35 ); Unknown36 = parser.ReadColumn< bool >( 36 ); Name = parser.ReadColumn< SeString >( 37 ); - ContentType = new LazyRow< ContentType >( lumina, parser.ReadColumn< byte >( 38 ), language ); + ContentType = new LazyRow< ContentType >( gameData, parser.ReadColumn< byte >( 38 ), language ); TransientKey = parser.ReadColumn< byte >( 39 ); Transient = parser.ReadColumn< uint >( 40 ); SortKey = parser.ReadColumn< ushort >( 41 ); @@ -149,13 +145,13 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) Icon = parser.ReadColumn< uint >( 43 ); Unknown44 = parser.ReadColumn< sbyte >( 44 ); LevelingRoulette = parser.ReadColumn< bool >( 45 ); - Level5060Roulette = parser.ReadColumn< bool >( 46 ); + Level506070Roulette = parser.ReadColumn< bool >( 46 ); MSQRoulette = parser.ReadColumn< bool >( 47 ); GuildHestRoulette = parser.ReadColumn< bool >( 48 ); ExpertRoulette = parser.ReadColumn< bool >( 49 ); TrialRoulette = parser.ReadColumn< bool >( 50 ); DailyFrontlineChallenge = parser.ReadColumn< bool >( 51 ); - Level70Roulette = parser.ReadColumn< bool >( 52 ); + Level80Roulette = parser.ReadColumn< bool >( 52 ); MentorRoulette = parser.ReadColumn< bool >( 53 ); Unknown54 = parser.ReadColumn< bool >( 54 ); Unknown55 = parser.ReadColumn< bool >( 55 ); diff --git a/src/Lumina.Excel/GeneratedSheets/ContentFinderConditionTransient.cs b/src/Lumina.Excel/GeneratedSheets/ContentFinderConditionTransient.cs index f277f2f9..0869c2c5 100644 --- a/src/Lumina.Excel/GeneratedSheets/ContentFinderConditionTransient.cs +++ b/src/Lumina.Excel/GeneratedSheets/ContentFinderConditionTransient.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ContentFinderConditionTransient", columnHash: 0xdebb20e3 )] - public class ContentFinderConditionTransient : IExcelRow + public class ContentFinderConditionTransient : ExcelRow { - public SeString Description; + public SeString Description { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Description = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/ContentGauge.cs b/src/Lumina.Excel/GeneratedSheets/ContentGauge.cs index 414713fb..e1419063 100644 --- a/src/Lumina.Excel/GeneratedSheets/ContentGauge.cs +++ b/src/Lumina.Excel/GeneratedSheets/ContentGauge.cs @@ -7,30 +7,26 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ContentGauge", columnHash: 0xf678f7f7 )] - public class ContentGauge : IExcelRow + public class ContentGauge : ExcelRow { - public SeString Name; - public LazyRow< ContentGaugeColor > Color; - public bool Unknown2; - public SeString TextString; - public sbyte Unknown4; - public sbyte Unknown5; - public byte Unknown6; - public sbyte Unknown7; - public sbyte Unknown8; - public byte Unknown9; + public SeString Name { get; set; } + public LazyRow< ContentGaugeColor > Color { get; set; } + public bool Unknown2 { get; set; } + public SeString TextString { get; set; } + public sbyte Unknown4 { get; set; } + public sbyte Unknown5 { get; set; } + public byte Unknown6 { get; set; } + public sbyte Unknown7 { get; set; } + public sbyte Unknown8 { get; set; } + public byte Unknown9 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); - Color = new LazyRow< ContentGaugeColor >( lumina, parser.ReadColumn< byte >( 1 ), language ); + Color = new LazyRow< ContentGaugeColor >( gameData, parser.ReadColumn< byte >( 1 ), language ); Unknown2 = parser.ReadColumn< bool >( 2 ); TextString = parser.ReadColumn< SeString >( 3 ); Unknown4 = parser.ReadColumn< sbyte >( 4 ); diff --git a/src/Lumina.Excel/GeneratedSheets/ContentGaugeColor.cs b/src/Lumina.Excel/GeneratedSheets/ContentGaugeColor.cs index db4f34da..9bca1137 100644 --- a/src/Lumina.Excel/GeneratedSheets/ContentGaugeColor.cs +++ b/src/Lumina.Excel/GeneratedSheets/ContentGaugeColor.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ContentGaugeColor", columnHash: 0x96a22aea )] - public class ContentGaugeColor : IExcelRow + public class ContentGaugeColor : ExcelRow { - public uint AndroidColor1; - public uint AndroidColor2; - public uint AndroidColor3; + public uint AndroidColor1 { get; set; } + public uint AndroidColor2 { get; set; } + public uint AndroidColor3 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); AndroidColor1 = parser.ReadColumn< uint >( 0 ); AndroidColor2 = parser.ReadColumn< uint >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/ContentMemberType.cs b/src/Lumina.Excel/GeneratedSheets/ContentMemberType.cs index 0cccbb1f..7054954a 100644 --- a/src/Lumina.Excel/GeneratedSheets/ContentMemberType.cs +++ b/src/Lumina.Excel/GeneratedSheets/ContentMemberType.cs @@ -7,36 +7,32 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ContentMemberType", columnHash: 0x65d5ee00 )] - public class ContentMemberType : IExcelRow + public class ContentMemberType : ExcelRow { - public bool Unknown0; - public byte Unknown1; - public bool Unknown2; - public bool Unknown3; - public byte Unknown4; - public byte Unknown5; - public byte Unknown6; - public byte Unknown7; - public byte Unknown8; - public byte TanksPerParty; - public byte HealersPerParty; - public byte MeleesPerParty; - public byte RangedPerParty; - public byte Unknown54; - public bool Unknown14; - public bool Unknown15; - public bool Unknown16; - public bool Unknown17; - public bool Unknown18; + public bool Unknown0 { get; set; } + public byte Unknown1 { get; set; } + public bool Unknown2 { get; set; } + public bool Unknown3 { get; set; } + public byte Unknown4 { get; set; } + public byte Unknown5 { get; set; } + public byte Unknown6 { get; set; } + public byte Unknown7 { get; set; } + public byte Unknown8 { get; set; } + public byte TanksPerParty { get; set; } + public byte HealersPerParty { get; set; } + public byte MeleesPerParty { get; set; } + public byte RangedPerParty { get; set; } + public byte Unknown54 { get; set; } + public bool Unknown14 { get; set; } + public bool Unknown15 { get; set; } + public bool Unknown16 { get; set; } + public bool Unknown17 { get; set; } + public bool Unknown18 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< bool >( 0 ); Unknown1 = parser.ReadColumn< byte >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/ContentNpcTalk.cs b/src/Lumina.Excel/GeneratedSheets/ContentNpcTalk.cs index d1eabbc9..a96be00b 100644 --- a/src/Lumina.Excel/GeneratedSheets/ContentNpcTalk.cs +++ b/src/Lumina.Excel/GeneratedSheets/ContentNpcTalk.cs @@ -7,24 +7,20 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ContentNpcTalk", columnHash: 0xcfa3d5cd )] - public class ContentNpcTalk : IExcelRow + public class ContentNpcTalk : ExcelRow { - public int Type; - public LazyRow< ContentTalk >[] ContentTalk; + public int Type { get; set; } + public LazyRow< ContentTalk >[] ContentTalk { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Type = parser.ReadColumn< int >( 0 ); ContentTalk = new LazyRow< ContentTalk >[ 8 ]; for( var i = 0; i < 8; i++ ) - ContentTalk[ i ] = new LazyRow< ContentTalk >( lumina, parser.ReadColumn< uint >( 1 + i ), language ); + ContentTalk[ i ] = new LazyRow< ContentTalk >( gameData, parser.ReadColumn< uint >( 1 + i ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/ContentRandomSelect.cs b/src/Lumina.Excel/GeneratedSheets/ContentRandomSelect.cs index 553be2d3..435f5048 100644 --- a/src/Lumina.Excel/GeneratedSheets/ContentRandomSelect.cs +++ b/src/Lumina.Excel/GeneratedSheets/ContentRandomSelect.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ContentRandomSelect", columnHash: 0xd870e208 )] - public class ContentRandomSelect : IExcelRow + public class ContentRandomSelect : ExcelRow { - public LazyRow< ContentFinderCondition > Name; + public LazyRow< ContentFinderCondition > Name { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Name = new LazyRow< ContentFinderCondition >( lumina, parser.ReadColumn< ushort >( 0 ), language ); + Name = new LazyRow< ContentFinderCondition >( gameData, parser.ReadColumn< ushort >( 0 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/ContentRoulette.cs b/src/Lumina.Excel/GeneratedSheets/ContentRoulette.cs index 9923d96e..b66f60b8 100644 --- a/src/Lumina.Excel/GeneratedSheets/ContentRoulette.cs +++ b/src/Lumina.Excel/GeneratedSheets/ContentRoulette.cs @@ -7,57 +7,53 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ContentRoulette", columnHash: 0xd8e2fea2 )] - public class ContentRoulette : IExcelRow + public class ContentRoulette : ExcelRow { - public SeString Name; - public SeString Category; - public SeString Unknown2; - public SeString Description; - public SeString DutyType; - public byte Unknown5; - public uint Unknown6; - public bool Unknown7; - public bool IsInDutyFinder; - public LazyRow< ContentRouletteOpenRule > OpenRule; - public bool Unknown10; - public byte RequiredLevel; - public byte Unknown12; - public ushort ItemLevelRequired; - public ushort Unknown14; - public uint Icon; - public LazyRow< ContentRouletteRoleBonus > ContentRouletteRoleBonus; - public ushort RewardTomeA; - public ushort RewardTomeB; - public ushort RewardTomeC; - public uint Unknown20; - public ushort Unknown21; - public byte SortKey; - public byte Unknown23; - public LazyRow< ContentMemberType > ContentMemberType; - public byte Unknown25; - public byte Unknown26; - public sbyte Unknown27; - public byte Unknown28; - public byte Unknown29; - public byte Unknown30; - public byte Unknown31; - public bool Unknown32; - public bool Unknown33; - public bool RequireAllDuties; - public bool Unknown35; - public byte ContentRouletteOpenRule; - public LazyRow< InstanceContent > InstanceContent; - public bool Unknown38; - public byte Unknown39; + public SeString Name { get; set; } + public SeString Category { get; set; } + public SeString Unknown2 { get; set; } + public SeString Description { get; set; } + public SeString DutyType { get; set; } + public byte Unknown5 { get; set; } + public uint Unknown6 { get; set; } + public bool Unknown7 { get; set; } + public bool IsInDutyFinder { get; set; } + public LazyRow< ContentRouletteOpenRule > OpenRule { get; set; } + public bool Unknown10 { get; set; } + public byte RequiredLevel { get; set; } + public byte Unknown12 { get; set; } + public ushort ItemLevelRequired { get; set; } + public ushort Unknown14 { get; set; } + public uint Icon { get; set; } + public LazyRow< ContentRouletteRoleBonus > ContentRouletteRoleBonus { get; set; } + public ushort RewardTomeA { get; set; } + public ushort RewardTomeB { get; set; } + public ushort RewardTomeC { get; set; } + public uint Unknown20 { get; set; } + public ushort Unknown21 { get; set; } + public byte SortKey { get; set; } + public byte Unknown23 { get; set; } + public LazyRow< ContentMemberType > ContentMemberType { get; set; } + public byte Unknown25 { get; set; } + public byte Unknown26 { get; set; } + public sbyte Unknown27 { get; set; } + public byte Unknown28 { get; set; } + public byte Unknown29 { get; set; } + public byte Unknown30 { get; set; } + public byte Unknown31 { get; set; } + public bool Unknown32 { get; set; } + public bool Unknown33 { get; set; } + public bool RequireAllDuties { get; set; } + public bool Unknown35 { get; set; } + public byte ContentRouletteOpenRule { get; set; } + public LazyRow< InstanceContent > InstanceContent { get; set; } + public bool Unknown38 { get; set; } + public byte Unknown39 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); Category = parser.ReadColumn< SeString >( 1 ); @@ -68,14 +64,14 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) Unknown6 = parser.ReadColumn< uint >( 6 ); Unknown7 = parser.ReadColumn< bool >( 7 ); IsInDutyFinder = parser.ReadColumn< bool >( 8 ); - OpenRule = new LazyRow< ContentRouletteOpenRule >( lumina, parser.ReadColumn< byte >( 9 ), language ); + OpenRule = new LazyRow< ContentRouletteOpenRule >( gameData, parser.ReadColumn< byte >( 9 ), language ); Unknown10 = parser.ReadColumn< bool >( 10 ); RequiredLevel = parser.ReadColumn< byte >( 11 ); Unknown12 = parser.ReadColumn< byte >( 12 ); ItemLevelRequired = parser.ReadColumn< ushort >( 13 ); Unknown14 = parser.ReadColumn< ushort >( 14 ); Icon = parser.ReadColumn< uint >( 15 ); - ContentRouletteRoleBonus = new LazyRow< ContentRouletteRoleBonus >( lumina, parser.ReadColumn< byte >( 16 ), language ); + ContentRouletteRoleBonus = new LazyRow< ContentRouletteRoleBonus >( gameData, parser.ReadColumn< byte >( 16 ), language ); RewardTomeA = parser.ReadColumn< ushort >( 17 ); RewardTomeB = parser.ReadColumn< ushort >( 18 ); RewardTomeC = parser.ReadColumn< ushort >( 19 ); @@ -83,7 +79,7 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) Unknown21 = parser.ReadColumn< ushort >( 21 ); SortKey = parser.ReadColumn< byte >( 22 ); Unknown23 = parser.ReadColumn< byte >( 23 ); - ContentMemberType = new LazyRow< ContentMemberType >( lumina, parser.ReadColumn< byte >( 24 ), language ); + ContentMemberType = new LazyRow< ContentMemberType >( gameData, parser.ReadColumn< byte >( 24 ), language ); Unknown25 = parser.ReadColumn< byte >( 25 ); Unknown26 = parser.ReadColumn< byte >( 26 ); Unknown27 = parser.ReadColumn< sbyte >( 27 ); @@ -96,7 +92,7 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) RequireAllDuties = parser.ReadColumn< bool >( 34 ); Unknown35 = parser.ReadColumn< bool >( 35 ); ContentRouletteOpenRule = parser.ReadColumn< byte >( 36 ); - InstanceContent = new LazyRow< InstanceContent >( lumina, parser.ReadColumn< ushort >( 37 ), language ); + InstanceContent = new LazyRow< InstanceContent >( gameData, parser.ReadColumn< ushort >( 37 ), language ); Unknown38 = parser.ReadColumn< bool >( 38 ); Unknown39 = parser.ReadColumn< byte >( 39 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/ContentRouletteOpenRule.cs b/src/Lumina.Excel/GeneratedSheets/ContentRouletteOpenRule.cs index e988c416..9f820a24 100644 --- a/src/Lumina.Excel/GeneratedSheets/ContentRouletteOpenRule.cs +++ b/src/Lumina.Excel/GeneratedSheets/ContentRouletteOpenRule.cs @@ -7,19 +7,15 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ContentRouletteOpenRule", columnHash: 0x985449ce )] - public class ContentRouletteOpenRule : IExcelRow + public class ContentRouletteOpenRule : ExcelRow { - public bool Unknown0; - public uint Type; + public bool Unknown0 { get; set; } + public uint Type { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< bool >( 0 ); Type = parser.ReadColumn< uint >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/ContentRouletteRoleBonus.cs b/src/Lumina.Excel/GeneratedSheets/ContentRouletteRoleBonus.cs index 1ab84632..bd71c604 100644 --- a/src/Lumina.Excel/GeneratedSheets/ContentRouletteRoleBonus.cs +++ b/src/Lumina.Excel/GeneratedSheets/ContentRouletteRoleBonus.cs @@ -7,29 +7,25 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ContentRouletteRoleBonus", columnHash: 0x8c1eab22 )] - public class ContentRouletteRoleBonus : IExcelRow + public class ContentRouletteRoleBonus : ExcelRow { - public ushort Unknown0; - public ushort Unknown1; - public ushort Unknown2; - public ushort Unknown3; - public ushort Unknown4; - public ushort Unknown5; - public LazyRow< Item > ItemRewardType; - public byte RewardAmount; - public byte Unknown8; - public uint Unknown9; - public byte Unknown10; - public byte Unknown11; + public ushort Unknown0 { get; set; } + public ushort Unknown1 { get; set; } + public ushort Unknown2 { get; set; } + public ushort Unknown3 { get; set; } + public ushort Unknown4 { get; set; } + public ushort Unknown5 { get; set; } + public LazyRow< Item > ItemRewardType { get; set; } + public byte RewardAmount { get; set; } + public byte Unknown8 { get; set; } + public uint Unknown9 { get; set; } + public byte Unknown10 { get; set; } + public byte Unknown11 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< ushort >( 0 ); Unknown1 = parser.ReadColumn< ushort >( 1 ); @@ -37,7 +33,7 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) Unknown3 = parser.ReadColumn< ushort >( 3 ); Unknown4 = parser.ReadColumn< ushort >( 4 ); Unknown5 = parser.ReadColumn< ushort >( 5 ); - ItemRewardType = new LazyRow< Item >( lumina, parser.ReadColumn< uint >( 6 ), language ); + ItemRewardType = new LazyRow< Item >( gameData, parser.ReadColumn< uint >( 6 ), language ); RewardAmount = parser.ReadColumn< byte >( 7 ); Unknown8 = parser.ReadColumn< byte >( 8 ); Unknown9 = parser.ReadColumn< uint >( 9 ); diff --git a/src/Lumina.Excel/GeneratedSheets/ContentTalk.cs b/src/Lumina.Excel/GeneratedSheets/ContentTalk.cs index 753b6406..9ecb1805 100644 --- a/src/Lumina.Excel/GeneratedSheets/ContentTalk.cs +++ b/src/Lumina.Excel/GeneratedSheets/ContentTalk.cs @@ -7,21 +7,17 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ContentTalk", columnHash: 0x5eb59ccb )] - public class ContentTalk : IExcelRow + public class ContentTalk : ExcelRow { - public LazyRow< ContentTalkParam > ContentTalkParam; - public SeString Text; + public LazyRow< ContentTalkParam > ContentTalkParam { get; set; } + public SeString Text { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - ContentTalkParam = new LazyRow< ContentTalkParam >( lumina, parser.ReadColumn< byte >( 0 ), language ); + ContentTalkParam = new LazyRow< ContentTalkParam >( gameData, parser.ReadColumn< byte >( 0 ), language ); Text = parser.ReadColumn< SeString >( 1 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/ContentTalkParam.cs b/src/Lumina.Excel/GeneratedSheets/ContentTalkParam.cs index 86f449d6..7667a017 100644 --- a/src/Lumina.Excel/GeneratedSheets/ContentTalkParam.cs +++ b/src/Lumina.Excel/GeneratedSheets/ContentTalkParam.cs @@ -7,27 +7,23 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ContentTalkParam", columnHash: 0xd4cefacf )] - public class ContentTalkParam : IExcelRow + public class ContentTalkParam : ExcelRow { - public bool Param; - public byte Unknown1; - public LazyRow< ActionTimeline > TestAction; - public sbyte Unknown3; - public sbyte Unknown4; - public byte Unknown5; + public bool Param { get; set; } + public byte Unknown1 { get; set; } + public LazyRow< ActionTimeline > TestAction { get; set; } + public sbyte Unknown3 { get; set; } + public sbyte Unknown4 { get; set; } + public byte Unknown5 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Param = parser.ReadColumn< bool >( 0 ); Unknown1 = parser.ReadColumn< byte >( 1 ); - TestAction = new LazyRow< ActionTimeline >( lumina, parser.ReadColumn< uint >( 2 ), language ); + TestAction = new LazyRow< ActionTimeline >( gameData, parser.ReadColumn< uint >( 2 ), language ); Unknown3 = parser.ReadColumn< sbyte >( 3 ); Unknown4 = parser.ReadColumn< sbyte >( 4 ); Unknown5 = parser.ReadColumn< byte >( 5 ); diff --git a/src/Lumina.Excel/GeneratedSheets/ContentType.cs b/src/Lumina.Excel/GeneratedSheets/ContentType.cs index 091e05d7..3ebcd2ed 100644 --- a/src/Lumina.Excel/GeneratedSheets/ContentType.cs +++ b/src/Lumina.Excel/GeneratedSheets/ContentType.cs @@ -7,23 +7,19 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ContentType", columnHash: 0xf75a9d4b )] - public class ContentType : IExcelRow + public class ContentType : ExcelRow { - public SeString Name; - public uint Icon; - public uint IconDutyFinder; - public byte Unknown3; - public byte Unknown4; - public byte Unknown5; + public SeString Name { get; set; } + public uint Icon { get; set; } + public uint IconDutyFinder { get; set; } + public byte Unknown3 { get; set; } + public byte Unknown4 { get; set; } + public byte Unknown5 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); Icon = parser.ReadColumn< uint >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/ContentsNote.cs b/src/Lumina.Excel/GeneratedSheets/ContentsNote.cs index aa40fb9f..8ccd1245 100644 --- a/src/Lumina.Excel/GeneratedSheets/ContentsNote.cs +++ b/src/Lumina.Excel/GeneratedSheets/ContentsNote.cs @@ -7,31 +7,27 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ContentsNote", columnHash: 0x748963d8 )] - public class ContentsNote : IExcelRow + public class ContentsNote : ExcelRow { - public byte ContentType; - public int Icon; - public byte MenuOrder; - public int RequiredAmount; - public byte Reward0; - public int ExpMultiplier; - public byte Reward1; - public int GilRward; - public ushort LevelUnlock; - public LazyRow< HowTo > HowTo; - public uint ReqUnlock; - public SeString Name; - public SeString Description; - public int ExpCap; + public byte ContentType { get; set; } + public int Icon { get; set; } + public byte MenuOrder { get; set; } + public int RequiredAmount { get; set; } + public byte Reward0 { get; set; } + public int ExpMultiplier { get; set; } + public byte Reward1 { get; set; } + public int GilRward { get; set; } + public ushort LevelUnlock { get; set; } + public LazyRow< HowTo > HowTo { get; set; } + public uint ReqUnlock { get; set; } + public SeString Name { get; set; } + public SeString Description { get; set; } + public int ExpCap { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); ContentType = parser.ReadColumn< byte >( 0 ); Icon = parser.ReadColumn< int >( 1 ); @@ -42,7 +38,7 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) Reward1 = parser.ReadColumn< byte >( 6 ); GilRward = parser.ReadColumn< int >( 7 ); LevelUnlock = parser.ReadColumn< ushort >( 8 ); - HowTo = new LazyRow< HowTo >( lumina, parser.ReadColumn< ushort >( 9 ), language ); + HowTo = new LazyRow< HowTo >( gameData, parser.ReadColumn< ushort >( 9 ), language ); ReqUnlock = parser.ReadColumn< uint >( 10 ); Name = parser.ReadColumn< SeString >( 11 ); Description = parser.ReadColumn< SeString >( 12 ); diff --git a/src/Lumina.Excel/GeneratedSheets/ContentsTutorial.cs b/src/Lumina.Excel/GeneratedSheets/ContentsTutorial.cs new file mode 100644 index 00000000..3394a70b --- /dev/null +++ b/src/Lumina.Excel/GeneratedSheets/ContentsTutorial.cs @@ -0,0 +1,28 @@ +// ReSharper disable All + +using Lumina.Text; +using Lumina.Data; +using Lumina.Data.Structs.Excel; + +namespace Lumina.Excel.GeneratedSheets +{ + [Sheet( "ContentsTutorial", columnHash: 0x85313f44 )] + public class ContentsTutorial : ExcelRow + { + + public SeString Name { get; set; } + public SeString Description { get; set; } + public LazyRow< ContentsTutorialPage >[] Page { get; set; } + + public override void PopulateData( RowParser parser, GameData gameData, Language language ) + { + base.PopulateData( parser, gameData, language ); + + Name = parser.ReadColumn< SeString >( 0 ); + Description = parser.ReadColumn< SeString >( 1 ); + Page = new LazyRow< ContentsTutorialPage >[ 8 ]; + for( var i = 0; i < 8; i++ ) + Page[ i ] = new LazyRow< ContentsTutorialPage >( gameData, parser.ReadColumn< int >( 2 + i ), language ); + } + } +} \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/ContentsTutorialPage.cs b/src/Lumina.Excel/GeneratedSheets/ContentsTutorialPage.cs new file mode 100644 index 00000000..ab0a65e2 --- /dev/null +++ b/src/Lumina.Excel/GeneratedSheets/ContentsTutorialPage.cs @@ -0,0 +1,24 @@ +// ReSharper disable All + +using Lumina.Text; +using Lumina.Data; +using Lumina.Data.Structs.Excel; + +namespace Lumina.Excel.GeneratedSheets +{ + [Sheet( "ContentsTutorialPage", columnHash: 0x0c8db36c )] + public class ContentsTutorialPage : ExcelRow + { + + public int Image { get; set; } + public SeString Description { get; set; } + + public override void PopulateData( RowParser parser, GameData gameData, Language language ) + { + base.PopulateData( parser, gameData, language ); + + Image = parser.ReadColumn< int >( 0 ); + Description = parser.ReadColumn< SeString >( 1 ); + } + } +} \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/CraftAction.cs b/src/Lumina.Excel/GeneratedSheets/CraftAction.cs index 2c5c1a77..aab2c663 100644 --- a/src/Lumina.Excel/GeneratedSheets/CraftAction.cs +++ b/src/Lumina.Excel/GeneratedSheets/CraftAction.cs @@ -7,58 +7,54 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "CraftAction", columnHash: 0x6057073b )] - public class CraftAction : IExcelRow + public class CraftAction : ExcelRow { - public SeString Name; - public SeString Description; - public LazyRow< ActionTimeline > AnimationStart; - public LazyRow< ActionTimeline > AnimationEnd; - public ushort Icon; - public LazyRow< ClassJob > ClassJob; - public LazyRow< ClassJobCategory > ClassJobCategory; - public byte ClassJobLevel; - public LazyRow< Quest > QuestRequirement; - public bool Specialist; - public ushort Unknown10; - public byte Cost; - public LazyRow< CraftAction > CRP; - public LazyRow< CraftAction > BSM; - public LazyRow< CraftAction > ARM; - public LazyRow< CraftAction > GSM; - public LazyRow< CraftAction > LTW; - public LazyRow< CraftAction > WVR; - public LazyRow< CraftAction > ALC; - public LazyRow< CraftAction > CUL; + public SeString Name { get; set; } + public SeString Description { get; set; } + public LazyRow< ActionTimeline > AnimationStart { get; set; } + public LazyRow< ActionTimeline > AnimationEnd { get; set; } + public ushort Icon { get; set; } + public LazyRow< ClassJob > ClassJob { get; set; } + public LazyRow< ClassJobCategory > ClassJobCategory { get; set; } + public byte ClassJobLevel { get; set; } + public LazyRow< Quest > QuestRequirement { get; set; } + public bool Specialist { get; set; } + public ushort Unknown10 { get; set; } + public byte Cost { get; set; } + public LazyRow< CraftAction > CRP { get; set; } + public LazyRow< CraftAction > BSM { get; set; } + public LazyRow< CraftAction > ARM { get; set; } + public LazyRow< CraftAction > GSM { get; set; } + public LazyRow< CraftAction > LTW { get; set; } + public LazyRow< CraftAction > WVR { get; set; } + public LazyRow< CraftAction > ALC { get; set; } + public LazyRow< CraftAction > CUL { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); Description = parser.ReadColumn< SeString >( 1 ); - AnimationStart = new LazyRow< ActionTimeline >( lumina, parser.ReadColumn< ushort >( 2 ), language ); - AnimationEnd = new LazyRow< ActionTimeline >( lumina, parser.ReadColumn< ushort >( 3 ), language ); + AnimationStart = new LazyRow< ActionTimeline >( gameData, parser.ReadColumn< ushort >( 2 ), language ); + AnimationEnd = new LazyRow< ActionTimeline >( gameData, parser.ReadColumn< ushort >( 3 ), language ); Icon = parser.ReadColumn< ushort >( 4 ); - ClassJob = new LazyRow< ClassJob >( lumina, parser.ReadColumn< sbyte >( 5 ), language ); - ClassJobCategory = new LazyRow< ClassJobCategory >( lumina, parser.ReadColumn< byte >( 6 ), language ); + ClassJob = new LazyRow< ClassJob >( gameData, parser.ReadColumn< sbyte >( 5 ), language ); + ClassJobCategory = new LazyRow< ClassJobCategory >( gameData, parser.ReadColumn< byte >( 6 ), language ); ClassJobLevel = parser.ReadColumn< byte >( 7 ); - QuestRequirement = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 8 ), language ); + QuestRequirement = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 8 ), language ); Specialist = parser.ReadColumn< bool >( 9 ); Unknown10 = parser.ReadColumn< ushort >( 10 ); Cost = parser.ReadColumn< byte >( 11 ); - CRP = new LazyRow< CraftAction >( lumina, parser.ReadColumn< int >( 12 ), language ); - BSM = new LazyRow< CraftAction >( lumina, parser.ReadColumn< int >( 13 ), language ); - ARM = new LazyRow< CraftAction >( lumina, parser.ReadColumn< int >( 14 ), language ); - GSM = new LazyRow< CraftAction >( lumina, parser.ReadColumn< int >( 15 ), language ); - LTW = new LazyRow< CraftAction >( lumina, parser.ReadColumn< int >( 16 ), language ); - WVR = new LazyRow< CraftAction >( lumina, parser.ReadColumn< int >( 17 ), language ); - ALC = new LazyRow< CraftAction >( lumina, parser.ReadColumn< int >( 18 ), language ); - CUL = new LazyRow< CraftAction >( lumina, parser.ReadColumn< int >( 19 ), language ); + CRP = new LazyRow< CraftAction >( gameData, parser.ReadColumn< int >( 12 ), language ); + BSM = new LazyRow< CraftAction >( gameData, parser.ReadColumn< int >( 13 ), language ); + ARM = new LazyRow< CraftAction >( gameData, parser.ReadColumn< int >( 14 ), language ); + GSM = new LazyRow< CraftAction >( gameData, parser.ReadColumn< int >( 15 ), language ); + LTW = new LazyRow< CraftAction >( gameData, parser.ReadColumn< int >( 16 ), language ); + WVR = new LazyRow< CraftAction >( gameData, parser.ReadColumn< int >( 17 ), language ); + ALC = new LazyRow< CraftAction >( gameData, parser.ReadColumn< int >( 18 ), language ); + CUL = new LazyRow< CraftAction >( gameData, parser.ReadColumn< int >( 19 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/CraftLeve.cs b/src/Lumina.Excel/GeneratedSheets/CraftLeve.cs index 97a4de9e..462c323b 100644 --- a/src/Lumina.Excel/GeneratedSheets/CraftLeve.cs +++ b/src/Lumina.Excel/GeneratedSheets/CraftLeve.cs @@ -7,7 +7,7 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "CraftLeve", columnHash: 0x51a3acc3 )] - public class CraftLeve : IExcelRow + public class CraftLeve : ExcelRow { public struct UnkStruct3Struct { @@ -15,20 +15,16 @@ public struct UnkStruct3Struct public ushort ItemCount; } - public LazyRow< Leve > Leve; - public int CraftLeveTalk; - public byte Repeats; - public UnkStruct3Struct[] UnkStruct3; + public LazyRow< Leve > Leve { get; set; } + public int CraftLeveTalk { get; set; } + public byte Repeats { get; set; } + public UnkStruct3Struct[] UnkStruct3 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Leve = new LazyRow< Leve >( lumina, parser.ReadColumn< int >( 0 ), language ); + Leve = new LazyRow< Leve >( gameData, parser.ReadColumn< int >( 0 ), language ); CraftLeveTalk = parser.ReadColumn< int >( 1 ); Repeats = parser.ReadColumn< byte >( 2 ); UnkStruct3 = new UnkStruct3Struct[ 4 ]; diff --git a/src/Lumina.Excel/GeneratedSheets/CraftLevelDifference.cs b/src/Lumina.Excel/GeneratedSheets/CraftLevelDifference.cs index ed3a811d..9f2301e5 100644 --- a/src/Lumina.Excel/GeneratedSheets/CraftLevelDifference.cs +++ b/src/Lumina.Excel/GeneratedSheets/CraftLevelDifference.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "CraftLevelDifference", columnHash: 0xba1851a4 )] - public class CraftLevelDifference : IExcelRow + public class CraftLevelDifference : ExcelRow { - public short Difference; - public short ProgressFactor; - public short QualityFactor; + public short Difference { get; set; } + public short ProgressFactor { get; set; } + public short QualityFactor { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Difference = parser.ReadColumn< short >( 0 ); ProgressFactor = parser.ReadColumn< short >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/CraftType.cs b/src/Lumina.Excel/GeneratedSheets/CraftType.cs index b2faa8c5..508afa8e 100644 --- a/src/Lumina.Excel/GeneratedSheets/CraftType.cs +++ b/src/Lumina.Excel/GeneratedSheets/CraftType.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "CraftType", columnHash: 0xb92c9b70 )] - public class CraftType : IExcelRow + public class CraftType : ExcelRow { - public byte MainPhysical; - public byte SubPhysical; - public SeString Name; + public byte MainPhysical { get; set; } + public byte SubPhysical { get; set; } + public SeString Name { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); MainPhysical = parser.ReadColumn< byte >( 0 ); SubPhysical = parser.ReadColumn< byte >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/Credit.cs b/src/Lumina.Excel/GeneratedSheets/Credit.cs index 49cdbb7f..f2473289 100644 --- a/src/Lumina.Excel/GeneratedSheets/Credit.cs +++ b/src/Lumina.Excel/GeneratedSheets/Credit.cs @@ -7,40 +7,36 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Credit", columnHash: 0x1fe6ec22 )] - public class Credit : IExcelRow + public class Credit : ExcelRow { - public byte Unknown0; - public LazyRow< CreditCast > Roles1; - public LazyRow< CreditCast > JapaneseCast1; - public LazyRow< CreditCast > EnglishCast1; - public LazyRow< CreditCast > FrenchCast1; - public LazyRow< CreditCast > GermanCast1; - public LazyRow< CreditCast > Roles2; - public LazyRow< CreditCast > JapaneseCast2; - public LazyRow< CreditCast > EnglishCast2; - public LazyRow< CreditCast > FrenchCast2; - public LazyRow< CreditCast > GermanCast2; + public byte Unknown0 { get; set; } + public LazyRow< CreditCast > Roles1 { get; set; } + public LazyRow< CreditCast > JapaneseCast1 { get; set; } + public LazyRow< CreditCast > EnglishCast1 { get; set; } + public LazyRow< CreditCast > FrenchCast1 { get; set; } + public LazyRow< CreditCast > GermanCast1 { get; set; } + public LazyRow< CreditCast > Roles2 { get; set; } + public LazyRow< CreditCast > JapaneseCast2 { get; set; } + public LazyRow< CreditCast > EnglishCast2 { get; set; } + public LazyRow< CreditCast > FrenchCast2 { get; set; } + public LazyRow< CreditCast > GermanCast2 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< byte >( 0 ); - Roles1 = new LazyRow< CreditCast >( lumina, parser.ReadColumn< ushort >( 1 ), language ); - JapaneseCast1 = new LazyRow< CreditCast >( lumina, parser.ReadColumn< ushort >( 2 ), language ); - EnglishCast1 = new LazyRow< CreditCast >( lumina, parser.ReadColumn< ushort >( 3 ), language ); - FrenchCast1 = new LazyRow< CreditCast >( lumina, parser.ReadColumn< ushort >( 4 ), language ); - GermanCast1 = new LazyRow< CreditCast >( lumina, parser.ReadColumn< ushort >( 5 ), language ); - Roles2 = new LazyRow< CreditCast >( lumina, parser.ReadColumn< ushort >( 6 ), language ); - JapaneseCast2 = new LazyRow< CreditCast >( lumina, parser.ReadColumn< ushort >( 7 ), language ); - EnglishCast2 = new LazyRow< CreditCast >( lumina, parser.ReadColumn< ushort >( 8 ), language ); - FrenchCast2 = new LazyRow< CreditCast >( lumina, parser.ReadColumn< ushort >( 9 ), language ); - GermanCast2 = new LazyRow< CreditCast >( lumina, parser.ReadColumn< ushort >( 10 ), language ); + Roles1 = new LazyRow< CreditCast >( gameData, parser.ReadColumn< ushort >( 1 ), language ); + JapaneseCast1 = new LazyRow< CreditCast >( gameData, parser.ReadColumn< ushort >( 2 ), language ); + EnglishCast1 = new LazyRow< CreditCast >( gameData, parser.ReadColumn< ushort >( 3 ), language ); + FrenchCast1 = new LazyRow< CreditCast >( gameData, parser.ReadColumn< ushort >( 4 ), language ); + GermanCast1 = new LazyRow< CreditCast >( gameData, parser.ReadColumn< ushort >( 5 ), language ); + Roles2 = new LazyRow< CreditCast >( gameData, parser.ReadColumn< ushort >( 6 ), language ); + JapaneseCast2 = new LazyRow< CreditCast >( gameData, parser.ReadColumn< ushort >( 7 ), language ); + EnglishCast2 = new LazyRow< CreditCast >( gameData, parser.ReadColumn< ushort >( 8 ), language ); + FrenchCast2 = new LazyRow< CreditCast >( gameData, parser.ReadColumn< ushort >( 9 ), language ); + GermanCast2 = new LazyRow< CreditCast >( gameData, parser.ReadColumn< ushort >( 10 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/CreditBackImage.cs b/src/Lumina.Excel/GeneratedSheets/CreditBackImage.cs index fe827731..3a178c19 100644 --- a/src/Lumina.Excel/GeneratedSheets/CreditBackImage.cs +++ b/src/Lumina.Excel/GeneratedSheets/CreditBackImage.cs @@ -7,22 +7,18 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "CreditBackImage", columnHash: 0x9ee8eba1 )] - public class CreditBackImage : IExcelRow + public class CreditBackImage : ExcelRow { - public ushort Unknown0; - public ushort Unknown1; - public bool Unknown54; - public uint BackImage; - public byte Unknown4; + public ushort Unknown0 { get; set; } + public ushort Unknown1 { get; set; } + public bool Unknown54 { get; set; } + public uint BackImage { get; set; } + public byte Unknown4 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< ushort >( 0 ); Unknown1 = parser.ReadColumn< ushort >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/CreditCast.cs b/src/Lumina.Excel/GeneratedSheets/CreditCast.cs index 9928b4c9..bd7eb9ab 100644 --- a/src/Lumina.Excel/GeneratedSheets/CreditCast.cs +++ b/src/Lumina.Excel/GeneratedSheets/CreditCast.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "CreditCast", columnHash: 0xdebb20e3 )] - public class CreditCast : IExcelRow + public class CreditCast : ExcelRow { - public SeString Name; + public SeString Name { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/CreditList.cs b/src/Lumina.Excel/GeneratedSheets/CreditList.cs index 96fc5a85..781d80a6 100644 --- a/src/Lumina.Excel/GeneratedSheets/CreditList.cs +++ b/src/Lumina.Excel/GeneratedSheets/CreditList.cs @@ -7,30 +7,26 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "CreditList", columnHash: 0x089033fa )] - public class CreditList : IExcelRow + public class CreditList : ExcelRow { - public ushort Scale; - public uint Icon; - public uint Font; - public byte Unknown3; - public byte Unknown4; - public LazyRow< CreditListText > Cast; + public ushort Scale { get; set; } + public uint Icon { get; set; } + public uint Font { get; set; } + public byte Unknown3 { get; set; } + public byte Unknown4 { get; set; } + public LazyRow< CreditListText > Cast { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Scale = parser.ReadColumn< ushort >( 0 ); Icon = parser.ReadColumn< uint >( 1 ); Font = parser.ReadColumn< uint >( 2 ); Unknown3 = parser.ReadColumn< byte >( 3 ); Unknown4 = parser.ReadColumn< byte >( 4 ); - Cast = new LazyRow< CreditListText >( lumina, parser.ReadColumn< uint >( 5 ), language ); + Cast = new LazyRow< CreditListText >( gameData, parser.ReadColumn< uint >( 5 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/CreditListText.cs b/src/Lumina.Excel/GeneratedSheets/CreditListText.cs index a8a6988c..a246384b 100644 --- a/src/Lumina.Excel/GeneratedSheets/CreditListText.cs +++ b/src/Lumina.Excel/GeneratedSheets/CreditListText.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "CreditListText", columnHash: 0xdebb20e3 )] - public class CreditListText : IExcelRow + public class CreditListText : ExcelRow { - public SeString Name; + public SeString Name { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/Currency.cs b/src/Lumina.Excel/GeneratedSheets/Currency.cs deleted file mode 100644 index 434c993b..00000000 --- a/src/Lumina.Excel/GeneratedSheets/Currency.cs +++ /dev/null @@ -1,34 +0,0 @@ -// ReSharper disable All - -using Lumina.Text; -using Lumina.Data; -using Lumina.Data.Structs.Excel; - -namespace Lumina.Excel.GeneratedSheets -{ - [Sheet( "Currency", columnHash: 0x072e6fd8 )] - public class Currency : IExcelRow - { - - public LazyRow< Item > Item; - public byte Unknown1; - public byte Unknown2; - public uint Limit; - public bool Unknown4; - - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) - { - RowId = parser.Row; - SubRowId = parser.SubRow; - - Item = new LazyRow< Item >( lumina, parser.ReadColumn< uint >( 0 ), language ); - Unknown1 = parser.ReadColumn< byte >( 1 ); - Unknown2 = parser.ReadColumn< byte >( 2 ); - Limit = parser.ReadColumn< uint >( 3 ); - Unknown4 = parser.ReadColumn< bool >( 4 ); - } - } -} \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/CustomTalk.cs b/src/Lumina.Excel/GeneratedSheets/CustomTalk.cs index 46e408bc..41e51e59 100644 --- a/src/Lumina.Excel/GeneratedSheets/CustomTalk.cs +++ b/src/Lumina.Excel/GeneratedSheets/CustomTalk.cs @@ -7,38 +7,34 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "CustomTalk", columnHash: 0x2a751293 )] - public class CustomTalk : IExcelRow + public class CustomTalk : ExcelRow { - public uint IconActor; - public uint IconMap; - public SeString Name; - public SeString[] ScriptInstruction; - public uint[] ScriptArg; - public bool Unknown63; - public SeString Unknown64; - public SeString Unknown65; - public bool Text; - public bool Unknown67; - public bool Unknown68; - public bool Unknown69; - public bool Unknown70; - public bool Unknown71; - public bool Unknown72; - public bool Unknown73; - public bool Unknown74; - public uint Unknown75; - public byte Unknown76; - public bool Unknown54; - public bool Unknown78; + public uint IconActor { get; set; } + public uint IconMap { get; set; } + public SeString Name { get; set; } + public SeString[] ScriptInstruction { get; set; } + public uint[] ScriptArg { get; set; } + public bool Unknown63 { get; set; } + public SeString Unknown64 { get; set; } + public SeString Unknown65 { get; set; } + public bool Text { get; set; } + public bool Unknown67 { get; set; } + public bool Unknown68 { get; set; } + public bool Unknown69 { get; set; } + public bool Unknown70 { get; set; } + public bool Unknown71 { get; set; } + public bool Unknown72 { get; set; } + public bool Unknown73 { get; set; } + public bool Unknown74 { get; set; } + public uint Unknown75 { get; set; } + public byte Unknown76 { get; set; } + public bool Unknown54 { get; set; } + public bool Unknown78 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); IconActor = parser.ReadColumn< uint >( 0 ); IconMap = parser.ReadColumn< uint >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/CustomTalkDynamicIcon.cs b/src/Lumina.Excel/GeneratedSheets/CustomTalkDynamicIcon.cs index be6223ad..7c09eb43 100644 --- a/src/Lumina.Excel/GeneratedSheets/CustomTalkDynamicIcon.cs +++ b/src/Lumina.Excel/GeneratedSheets/CustomTalkDynamicIcon.cs @@ -7,19 +7,15 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "CustomTalkDynamicIcon", columnHash: 0x5d58cc84 )] - public class CustomTalkDynamicIcon : IExcelRow + public class CustomTalkDynamicIcon : ExcelRow { - public uint SmallIcon; - public uint LargeIcon; + public uint SmallIcon { get; set; } + public uint LargeIcon { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); SmallIcon = parser.ReadColumn< uint >( 0 ); LargeIcon = parser.ReadColumn< uint >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/CustomTalkNestHandlers.cs b/src/Lumina.Excel/GeneratedSheets/CustomTalkNestHandlers.cs index e475d15c..bc6e1e1e 100644 --- a/src/Lumina.Excel/GeneratedSheets/CustomTalkNestHandlers.cs +++ b/src/Lumina.Excel/GeneratedSheets/CustomTalkNestHandlers.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "CustomTalkNestHandlers", columnHash: 0xdbf43666 )] - public class CustomTalkNestHandlers : IExcelRow + public class CustomTalkNestHandlers : ExcelRow { - public uint NestHandler; + public uint NestHandler { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); NestHandler = parser.ReadColumn< uint >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/CutScreenImage.cs b/src/Lumina.Excel/GeneratedSheets/CutScreenImage.cs index 396ce600..b2b12562 100644 --- a/src/Lumina.Excel/GeneratedSheets/CutScreenImage.cs +++ b/src/Lumina.Excel/GeneratedSheets/CutScreenImage.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "CutScreenImage", columnHash: 0xe4a523cd )] - public class CutScreenImage : IExcelRow + public class CutScreenImage : ExcelRow { - public short Type; - public int Image; - public short Unknown2; + public short Type { get; set; } + public int Image { get; set; } + public short Unknown2 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Type = parser.ReadColumn< short >( 0 ); Image = parser.ReadColumn< int >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/Cutscene.cs b/src/Lumina.Excel/GeneratedSheets/Cutscene.cs index 7a3350c4..8bfaa4cd 100644 --- a/src/Lumina.Excel/GeneratedSheets/Cutscene.cs +++ b/src/Lumina.Excel/GeneratedSheets/Cutscene.cs @@ -7,25 +7,21 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Cutscene", columnHash: 0x35b9ac80 )] - public class Cutscene : IExcelRow + public class Cutscene : ExcelRow { - public SeString Path; - public byte Unknown1; - public byte Unknown2; - public bool Unknown3; - public int Unknown4; - public int Unknown5; - public int Unknown6; - public int Unknown7; + public SeString Path { get; set; } + public byte Unknown1 { get; set; } + public byte Unknown2 { get; set; } + public bool Unknown3 { get; set; } + public int Unknown4 { get; set; } + public int Unknown5 { get; set; } + public int Unknown6 { get; set; } + public int Unknown7 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Path = parser.ReadColumn< SeString >( 0 ); Unknown1 = parser.ReadColumn< byte >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/CutsceneMotion.cs b/src/Lumina.Excel/GeneratedSheets/CutsceneMotion.cs index 75e845bc..46570d63 100644 --- a/src/Lumina.Excel/GeneratedSheets/CutsceneMotion.cs +++ b/src/Lumina.Excel/GeneratedSheets/CutsceneMotion.cs @@ -7,28 +7,24 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "CutsceneMotion", columnHash: 0x3d86ce33 )] - public class CutsceneMotion : IExcelRow + public class CutsceneMotion : ExcelRow { - public float WALK_LOOP_SPEED; - public float RUN_LOOP_SPEED; - public float SLOWWALK_LOOP_SPEED; - public float SLOWRUN_LOOP_SPEED; - public float BATTLEWALK_LOOP_SPEED; - public float BATTLERUN_LOOP_SPEED; - public float DASH_LOOP_SPEED; - public byte TURN_CW90_FRAME; - public byte TURN_CCW90_FRAME; - public byte TURN_CW180_FRAME; - public byte TURN_CCW180_FRAME; + public float WALK_LOOP_SPEED { get; set; } + public float RUN_LOOP_SPEED { get; set; } + public float SLOWWALK_LOOP_SPEED { get; set; } + public float SLOWRUN_LOOP_SPEED { get; set; } + public float BATTLEWALK_LOOP_SPEED { get; set; } + public float BATTLERUN_LOOP_SPEED { get; set; } + public float DASH_LOOP_SPEED { get; set; } + public byte TURN_CW90_FRAME { get; set; } + public byte TURN_CCW90_FRAME { get; set; } + public byte TURN_CW180_FRAME { get; set; } + public byte TURN_CCW180_FRAME { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); WALK_LOOP_SPEED = parser.ReadColumn< float >( 0 ); RUN_LOOP_SPEED = parser.ReadColumn< float >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/CutsceneWorkIndex.cs b/src/Lumina.Excel/GeneratedSheets/CutsceneWorkIndex.cs index aa6050c9..252f0454 100644 --- a/src/Lumina.Excel/GeneratedSheets/CutsceneWorkIndex.cs +++ b/src/Lumina.Excel/GeneratedSheets/CutsceneWorkIndex.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "CutsceneWorkIndex", columnHash: 0xd870e208 )] - public class CutsceneWorkIndex : IExcelRow + public class CutsceneWorkIndex : ExcelRow { - public ushort WorkIndex; + public ushort WorkIndex { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); WorkIndex = parser.ReadColumn< ushort >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/CycleTime.cs b/src/Lumina.Excel/GeneratedSheets/CycleTime.cs index 8b5e42a4..e302e8d1 100644 --- a/src/Lumina.Excel/GeneratedSheets/CycleTime.cs +++ b/src/Lumina.Excel/GeneratedSheets/CycleTime.cs @@ -7,19 +7,15 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "CycleTime", columnHash: 0x5d58cc84 )] - public class CycleTime : IExcelRow + public class CycleTime : ExcelRow { - public uint FirstCycle; - public uint Cycle; + public uint FirstCycle { get; set; } + public uint Cycle { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); FirstCycle = parser.ReadColumn< uint >( 0 ); Cycle = parser.ReadColumn< uint >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/DailySupplyItem.cs b/src/Lumina.Excel/GeneratedSheets/DailySupplyItem.cs index 8cc70627..a2e6dd01 100644 --- a/src/Lumina.Excel/GeneratedSheets/DailySupplyItem.cs +++ b/src/Lumina.Excel/GeneratedSheets/DailySupplyItem.cs @@ -7,7 +7,7 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "DailySupplyItem", columnHash: 0x5e7b2507 )] - public class DailySupplyItem : IExcelRow + public class DailySupplyItem : ExcelRow { public struct UnkStruct0Struct { @@ -16,15 +16,11 @@ public struct UnkStruct0Struct public byte RecipeLevel; } - public UnkStruct0Struct[] UnkStruct0; + public UnkStruct0Struct[] UnkStruct0 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); UnkStruct0 = new UnkStruct0Struct[ 8 ]; for( var i = 0; i < 8; i++ ) diff --git a/src/Lumina.Excel/GeneratedSheets/DawnContent.cs b/src/Lumina.Excel/GeneratedSheets/DawnContent.cs index 711653c3..97883637 100644 --- a/src/Lumina.Excel/GeneratedSheets/DawnContent.cs +++ b/src/Lumina.Excel/GeneratedSheets/DawnContent.cs @@ -7,21 +7,17 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "DawnContent", columnHash: 0x5d58cc84 )] - public class DawnContent : IExcelRow + public class DawnContent : ExcelRow { - public LazyRow< ContentFinderCondition > Content; - public uint Exp; + public LazyRow< ContentFinderCondition > Content { get; set; } + public uint Exp { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Content = new LazyRow< ContentFinderCondition >( lumina, parser.ReadColumn< uint >( 0 ), language ); + Content = new LazyRow< ContentFinderCondition >( gameData, parser.ReadColumn< uint >( 0 ), language ); Exp = parser.ReadColumn< uint >( 1 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/DawnGrowMember.cs b/src/Lumina.Excel/GeneratedSheets/DawnGrowMember.cs index 6b6febe7..be6fc9bb 100644 --- a/src/Lumina.Excel/GeneratedSheets/DawnGrowMember.cs +++ b/src/Lumina.Excel/GeneratedSheets/DawnGrowMember.cs @@ -7,32 +7,28 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "DawnGrowMember", columnHash: 0xa0995e80 )] - public class DawnGrowMember : IExcelRow + public class DawnGrowMember : ExcelRow { - public LazyRow< ENpcResident > Member; - public uint ImageName; - public uint BigImageOld; - public uint BigImageNew; - public uint SmallImageOld; - public uint SmallImageNew; - public LazyRow< DawnMemberUIParam > Class; + public LazyRow< ENpcResident > Member { get; set; } + public uint ImageName { get; set; } + public uint BigImageOld { get; set; } + public uint BigImageNew { get; set; } + public uint SmallImageOld { get; set; } + public uint SmallImageNew { get; set; } + public LazyRow< DawnMemberUIParam > Class { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Member = new LazyRow< ENpcResident >( lumina, parser.ReadColumn< uint >( 0 ), language ); + Member = new LazyRow< ENpcResident >( gameData, parser.ReadColumn< uint >( 0 ), language ); ImageName = parser.ReadColumn< uint >( 1 ); BigImageOld = parser.ReadColumn< uint >( 2 ); BigImageNew = parser.ReadColumn< uint >( 3 ); SmallImageOld = parser.ReadColumn< uint >( 4 ); SmallImageNew = parser.ReadColumn< uint >( 5 ); - Class = new LazyRow< DawnMemberUIParam >( lumina, parser.ReadColumn< byte >( 6 ), language ); + Class = new LazyRow< DawnMemberUIParam >( gameData, parser.ReadColumn< byte >( 6 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/DawnMemberUIParam.cs b/src/Lumina.Excel/GeneratedSheets/DawnMemberUIParam.cs index b7b4d7a3..76cb68e2 100644 --- a/src/Lumina.Excel/GeneratedSheets/DawnMemberUIParam.cs +++ b/src/Lumina.Excel/GeneratedSheets/DawnMemberUIParam.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "DawnMemberUIParam", columnHash: 0x0fd503c6 )] - public class DawnMemberUIParam : IExcelRow + public class DawnMemberUIParam : ExcelRow { - public SeString ClassSingular; - public uint VoiceLine; - public SeString ClassPlural; + public SeString ClassSingular { get; set; } + public uint VoiceLine { get; set; } + public SeString ClassPlural { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); ClassSingular = parser.ReadColumn< SeString >( 0 ); VoiceLine = parser.ReadColumn< uint >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/DawnQuestAnnounce.cs b/src/Lumina.Excel/GeneratedSheets/DawnQuestAnnounce.cs index f44309bf..cf040663 100644 --- a/src/Lumina.Excel/GeneratedSheets/DawnQuestAnnounce.cs +++ b/src/Lumina.Excel/GeneratedSheets/DawnQuestAnnounce.cs @@ -7,26 +7,22 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "DawnQuestAnnounce", columnHash: 0xf8bddb48 )] - public class DawnQuestAnnounce : IExcelRow + public class DawnQuestAnnounce : ExcelRow { - public LazyRow< Quest > Quest; - public LazyRow< DawnContent > Content; - public LazyRow< ENpcResident >[] ENPC; + public LazyRow< Quest > Quest { get; set; } + public LazyRow< DawnContent > Content { get; set; } + public LazyRow< ENpcResident >[] ENPC { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Quest = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 0 ), language ); - Content = new LazyRow< DawnContent >( lumina, parser.ReadColumn< byte >( 1 ), language ); + Quest = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 0 ), language ); + Content = new LazyRow< DawnContent >( gameData, parser.ReadColumn< byte >( 1 ), language ); ENPC = new LazyRow< ENpcResident >[ 6 ]; for( var i = 0; i < 6; i++ ) - ENPC[ i ] = new LazyRow< ENpcResident >( lumina, parser.ReadColumn< uint >( 2 + i ), language ); + ENPC[ i ] = new LazyRow< ENpcResident >( gameData, parser.ReadColumn< uint >( 2 + i ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/DawnQuestMember.cs b/src/Lumina.Excel/GeneratedSheets/DawnQuestMember.cs index c5ff7a68..ec9eb96a 100644 --- a/src/Lumina.Excel/GeneratedSheets/DawnQuestMember.cs +++ b/src/Lumina.Excel/GeneratedSheets/DawnQuestMember.cs @@ -7,28 +7,24 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "DawnQuestMember", columnHash: 0x6ce9409c )] - public class DawnQuestMember : IExcelRow + public class DawnQuestMember : ExcelRow { - public LazyRow< ENpcResident > Member; - public uint ImageName; - public uint BigImageOld; - public uint BigImageNew; - public LazyRow< DawnMemberUIParam > Class; + public LazyRow< ENpcResident > Member { get; set; } + public uint ImageName { get; set; } + public uint BigImageOld { get; set; } + public uint BigImageNew { get; set; } + public LazyRow< DawnMemberUIParam > Class { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Member = new LazyRow< ENpcResident >( lumina, parser.ReadColumn< uint >( 0 ), language ); + Member = new LazyRow< ENpcResident >( gameData, parser.ReadColumn< uint >( 0 ), language ); ImageName = parser.ReadColumn< uint >( 1 ); BigImageOld = parser.ReadColumn< uint >( 2 ); BigImageNew = parser.ReadColumn< uint >( 3 ); - Class = new LazyRow< DawnMemberUIParam >( lumina, parser.ReadColumn< byte >( 4 ), language ); + Class = new LazyRow< DawnMemberUIParam >( gameData, parser.ReadColumn< byte >( 4 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/DeepDungeon.cs b/src/Lumina.Excel/GeneratedSheets/DeepDungeon.cs index 73a672a2..c4763a5b 100644 --- a/src/Lumina.Excel/GeneratedSheets/DeepDungeon.cs +++ b/src/Lumina.Excel/GeneratedSheets/DeepDungeon.cs @@ -7,35 +7,31 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "DeepDungeon", columnHash: 0xea7a6143 )] - public class DeepDungeon : IExcelRow + public class DeepDungeon : ExcelRow { - public LazyRow< DeepDungeonEquipment > AetherpoolArm; - public LazyRow< DeepDungeonEquipment > AetherpoolArmor; - public LazyRow< DeepDungeonItem >[] PomanderSlot; - public LazyRow< DeepDungeonMagicStone >[] MagiciteSlot; - public SeString Name; - public LazyRow< ContentFinderCondition > ContentFinderConditionStart; - public bool Unknown24; + public LazyRow< DeepDungeonEquipment > AetherpoolArm { get; set; } + public LazyRow< DeepDungeonEquipment > AetherpoolArmor { get; set; } + public LazyRow< DeepDungeonItem >[] PomanderSlot { get; set; } + public LazyRow< DeepDungeonMagicStone >[] MagiciteSlot { get; set; } + public SeString Name { get; set; } + public LazyRow< ContentFinderCondition > ContentFinderConditionStart { get; set; } + public bool Unknown24 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - AetherpoolArm = new LazyRow< DeepDungeonEquipment >( lumina, parser.ReadColumn< byte >( 0 ), language ); - AetherpoolArmor = new LazyRow< DeepDungeonEquipment >( lumina, parser.ReadColumn< byte >( 1 ), language ); + AetherpoolArm = new LazyRow< DeepDungeonEquipment >( gameData, parser.ReadColumn< byte >( 0 ), language ); + AetherpoolArmor = new LazyRow< DeepDungeonEquipment >( gameData, parser.ReadColumn< byte >( 1 ), language ); PomanderSlot = new LazyRow< DeepDungeonItem >[ 16 ]; for( var i = 0; i < 16; i++ ) - PomanderSlot[ i ] = new LazyRow< DeepDungeonItem >( lumina, parser.ReadColumn< byte >( 2 + i ), language ); + PomanderSlot[ i ] = new LazyRow< DeepDungeonItem >( gameData, parser.ReadColumn< byte >( 2 + i ), language ); MagiciteSlot = new LazyRow< DeepDungeonMagicStone >[ 4 ]; for( var i = 0; i < 4; i++ ) - MagiciteSlot[ i ] = new LazyRow< DeepDungeonMagicStone >( lumina, parser.ReadColumn< byte >( 18 + i ), language ); + MagiciteSlot[ i ] = new LazyRow< DeepDungeonMagicStone >( gameData, parser.ReadColumn< byte >( 18 + i ), language ); Name = parser.ReadColumn< SeString >( 22 ); - ContentFinderConditionStart = new LazyRow< ContentFinderCondition >( lumina, parser.ReadColumn< ushort >( 23 ), language ); + ContentFinderConditionStart = new LazyRow< ContentFinderCondition >( gameData, parser.ReadColumn< ushort >( 23 ), language ); Unknown24 = parser.ReadColumn< bool >( 24 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/DeepDungeonBan.cs b/src/Lumina.Excel/GeneratedSheets/DeepDungeonBan.cs index 57e7db9e..a5a76815 100644 --- a/src/Lumina.Excel/GeneratedSheets/DeepDungeonBan.cs +++ b/src/Lumina.Excel/GeneratedSheets/DeepDungeonBan.cs @@ -7,24 +7,20 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "DeepDungeonBan", columnHash: 0xdc23efe7 )] - public class DeepDungeonBan : IExcelRow + public class DeepDungeonBan : ExcelRow { - public LazyRow< ScreenImage > ScreenImage; - public LazyRow< LogMessage > LogMessage; - public LazyRow< DeepDungeonFloorEffectUI > Name; + public LazyRow< ScreenImage > ScreenImage { get; set; } + public LazyRow< LogMessage > LogMessage { get; set; } + public LazyRow< DeepDungeonFloorEffectUI > Name { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - ScreenImage = new LazyRow< ScreenImage >( lumina, parser.ReadColumn< ushort >( 0 ), language ); - LogMessage = new LazyRow< LogMessage >( lumina, parser.ReadColumn< ushort >( 1 ), language ); - Name = new LazyRow< DeepDungeonFloorEffectUI >( lumina, parser.ReadColumn< ushort >( 2 ), language ); + ScreenImage = new LazyRow< ScreenImage >( gameData, parser.ReadColumn< ushort >( 0 ), language ); + LogMessage = new LazyRow< LogMessage >( gameData, parser.ReadColumn< ushort >( 1 ), language ); + Name = new LazyRow< DeepDungeonFloorEffectUI >( gameData, parser.ReadColumn< ushort >( 2 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/DeepDungeonDanger.cs b/src/Lumina.Excel/GeneratedSheets/DeepDungeonDanger.cs index 7a902501..20793cc0 100644 --- a/src/Lumina.Excel/GeneratedSheets/DeepDungeonDanger.cs +++ b/src/Lumina.Excel/GeneratedSheets/DeepDungeonDanger.cs @@ -7,24 +7,20 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "DeepDungeonDanger", columnHash: 0xdc23efe7 )] - public class DeepDungeonDanger : IExcelRow + public class DeepDungeonDanger : ExcelRow { - public LazyRow< ScreenImage > ScreenImage; - public LazyRow< LogMessage > LogMessage; - public LazyRow< DeepDungeonFloorEffectUI > Name; + public LazyRow< ScreenImage > ScreenImage { get; set; } + public LazyRow< LogMessage > LogMessage { get; set; } + public LazyRow< DeepDungeonFloorEffectUI > Name { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - ScreenImage = new LazyRow< ScreenImage >( lumina, parser.ReadColumn< ushort >( 0 ), language ); - LogMessage = new LazyRow< LogMessage >( lumina, parser.ReadColumn< ushort >( 1 ), language ); - Name = new LazyRow< DeepDungeonFloorEffectUI >( lumina, parser.ReadColumn< ushort >( 2 ), language ); + ScreenImage = new LazyRow< ScreenImage >( gameData, parser.ReadColumn< ushort >( 0 ), language ); + LogMessage = new LazyRow< LogMessage >( gameData, parser.ReadColumn< ushort >( 1 ), language ); + Name = new LazyRow< DeepDungeonFloorEffectUI >( gameData, parser.ReadColumn< ushort >( 2 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/DeepDungeonEquipment.cs b/src/Lumina.Excel/GeneratedSheets/DeepDungeonEquipment.cs index 54ba7448..bfb7c6da 100644 --- a/src/Lumina.Excel/GeneratedSheets/DeepDungeonEquipment.cs +++ b/src/Lumina.Excel/GeneratedSheets/DeepDungeonEquipment.cs @@ -7,28 +7,24 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "DeepDungeonEquipment", columnHash: 0xc638f2bf )] - public class DeepDungeonEquipment : IExcelRow + public class DeepDungeonEquipment : ExcelRow { - public uint Icon; - public SeString Singular; - public sbyte Adjective; - public SeString Plural; - public sbyte PossessivePronoun; - public sbyte StartsWithVowel; - public sbyte Unknown6; - public sbyte Pronoun; - public sbyte Article; - public SeString Name; - public SeString Description; + public uint Icon { get; set; } + public SeString Singular { get; set; } + public sbyte Adjective { get; set; } + public SeString Plural { get; set; } + public sbyte PossessivePronoun { get; set; } + public sbyte StartsWithVowel { get; set; } + public sbyte Unknown6 { get; set; } + public sbyte Pronoun { get; set; } + public sbyte Article { get; set; } + public SeString Name { get; set; } + public SeString Description { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Icon = parser.ReadColumn< uint >( 0 ); Singular = parser.ReadColumn< SeString >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/DeepDungeonFloorEffectUI.cs b/src/Lumina.Excel/GeneratedSheets/DeepDungeonFloorEffectUI.cs index 78ebeba2..e7f6fef8 100644 --- a/src/Lumina.Excel/GeneratedSheets/DeepDungeonFloorEffectUI.cs +++ b/src/Lumina.Excel/GeneratedSheets/DeepDungeonFloorEffectUI.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "DeepDungeonFloorEffectUI", columnHash: 0x11a44a12 )] - public class DeepDungeonFloorEffectUI : IExcelRow + public class DeepDungeonFloorEffectUI : ExcelRow { - public uint Icon; - public SeString Name; - public SeString Description; + public uint Icon { get; set; } + public SeString Name { get; set; } + public SeString Description { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Icon = parser.ReadColumn< uint >( 0 ); Name = parser.ReadColumn< SeString >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/DeepDungeonItem.cs b/src/Lumina.Excel/GeneratedSheets/DeepDungeonItem.cs index a4ac2781..3e06beb0 100644 --- a/src/Lumina.Excel/GeneratedSheets/DeepDungeonItem.cs +++ b/src/Lumina.Excel/GeneratedSheets/DeepDungeonItem.cs @@ -7,29 +7,25 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "DeepDungeonItem", columnHash: 0x878768c6 )] - public class DeepDungeonItem : IExcelRow + public class DeepDungeonItem : ExcelRow { - public uint Icon; - public SeString Singular; - public sbyte Adjective; - public SeString Plural; - public sbyte PossessivePronoun; - public sbyte StartsWithVowel; - public sbyte Unknown6; - public sbyte Pronoun; - public sbyte Article; - public SeString Name; - public SeString Tooltip; - public LazyRow< Action > Action; + public uint Icon { get; set; } + public SeString Singular { get; set; } + public sbyte Adjective { get; set; } + public SeString Plural { get; set; } + public sbyte PossessivePronoun { get; set; } + public sbyte StartsWithVowel { get; set; } + public sbyte Unknown6 { get; set; } + public sbyte Pronoun { get; set; } + public sbyte Article { get; set; } + public SeString Name { get; set; } + public SeString Tooltip { get; set; } + public LazyRow< Action > Action { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Icon = parser.ReadColumn< uint >( 0 ); Singular = parser.ReadColumn< SeString >( 1 ); @@ -42,7 +38,7 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) Article = parser.ReadColumn< sbyte >( 8 ); Name = parser.ReadColumn< SeString >( 9 ); Tooltip = parser.ReadColumn< SeString >( 10 ); - Action = new LazyRow< Action >( lumina, parser.ReadColumn< uint >( 11 ), language ); + Action = new LazyRow< Action >( gameData, parser.ReadColumn< uint >( 11 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/DeepDungeonLayer.cs b/src/Lumina.Excel/GeneratedSheets/DeepDungeonLayer.cs index 04830421..0bd61ed7 100644 --- a/src/Lumina.Excel/GeneratedSheets/DeepDungeonLayer.cs +++ b/src/Lumina.Excel/GeneratedSheets/DeepDungeonLayer.cs @@ -7,30 +7,26 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "DeepDungeonLayer", columnHash: 0x832a5a83 )] - public class DeepDungeonLayer : IExcelRow + public class DeepDungeonLayer : ExcelRow { - public LazyRow< DeepDungeon > DeepDungeon; - public byte FloorSet; - public LazyRow< DeepDungeonMap5X > RoomA; - public LazyRow< DeepDungeonMap5X > RoomB; - public LazyRow< DeepDungeonMap5X > RoomC; - public byte WepMinLv; - public byte ArmourMinLv; + public LazyRow< DeepDungeon > DeepDungeon { get; set; } + public byte FloorSet { get; set; } + public LazyRow< DeepDungeonMap5X > RoomA { get; set; } + public LazyRow< DeepDungeonMap5X > RoomB { get; set; } + public LazyRow< DeepDungeonMap5X > RoomC { get; set; } + public byte WepMinLv { get; set; } + public byte ArmourMinLv { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - DeepDungeon = new LazyRow< DeepDungeon >( lumina, parser.ReadColumn< byte >( 0 ), language ); + DeepDungeon = new LazyRow< DeepDungeon >( gameData, parser.ReadColumn< byte >( 0 ), language ); FloorSet = parser.ReadColumn< byte >( 1 ); - RoomA = new LazyRow< DeepDungeonMap5X >( lumina, parser.ReadColumn< ushort >( 2 ), language ); - RoomB = new LazyRow< DeepDungeonMap5X >( lumina, parser.ReadColumn< ushort >( 3 ), language ); - RoomC = new LazyRow< DeepDungeonMap5X >( lumina, parser.ReadColumn< ushort >( 4 ), language ); + RoomA = new LazyRow< DeepDungeonMap5X >( gameData, parser.ReadColumn< ushort >( 2 ), language ); + RoomB = new LazyRow< DeepDungeonMap5X >( gameData, parser.ReadColumn< ushort >( 3 ), language ); + RoomC = new LazyRow< DeepDungeonMap5X >( gameData, parser.ReadColumn< ushort >( 4 ), language ); WepMinLv = parser.ReadColumn< byte >( 5 ); ArmourMinLv = parser.ReadColumn< byte >( 6 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/DeepDungeonMagicStone.cs b/src/Lumina.Excel/GeneratedSheets/DeepDungeonMagicStone.cs index 2833cf54..be5578a6 100644 --- a/src/Lumina.Excel/GeneratedSheets/DeepDungeonMagicStone.cs +++ b/src/Lumina.Excel/GeneratedSheets/DeepDungeonMagicStone.cs @@ -7,28 +7,24 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "DeepDungeonMagicStone", columnHash: 0xc638f2bf )] - public class DeepDungeonMagicStone : IExcelRow + public class DeepDungeonMagicStone : ExcelRow { - public uint Icon; - public SeString Singular; - public sbyte Adjective; - public SeString Plural; - public sbyte PossessivePronoun; - public sbyte StartsWithVowel; - public sbyte Unknown6; - public sbyte Pronoun; - public sbyte Article; - public SeString Name; - public SeString Tooltip; + public uint Icon { get; set; } + public SeString Singular { get; set; } + public sbyte Adjective { get; set; } + public SeString Plural { get; set; } + public sbyte PossessivePronoun { get; set; } + public sbyte StartsWithVowel { get; set; } + public sbyte Unknown6 { get; set; } + public sbyte Pronoun { get; set; } + public sbyte Article { get; set; } + public SeString Name { get; set; } + public SeString Tooltip { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Icon = parser.ReadColumn< uint >( 0 ); Singular = parser.ReadColumn< SeString >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/DeepDungeonMap5X.cs b/src/Lumina.Excel/GeneratedSheets/DeepDungeonMap5X.cs index ecca851d..9cc57c93 100644 --- a/src/Lumina.Excel/GeneratedSheets/DeepDungeonMap5X.cs +++ b/src/Lumina.Excel/GeneratedSheets/DeepDungeonMap5X.cs @@ -7,22 +7,18 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "DeepDungeonMap5X", columnHash: 0x64a88f98 )] - public class DeepDungeonMap5X : IExcelRow + public class DeepDungeonMap5X : ExcelRow { - public LazyRow< DeepDungeonRoom >[] DeepDungeonRoom; + public LazyRow< DeepDungeonRoom >[] DeepDungeonRoom { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); DeepDungeonRoom = new LazyRow< DeepDungeonRoom >[ 5 ]; for( var i = 0; i < 5; i++ ) - DeepDungeonRoom[ i ] = new LazyRow< DeepDungeonRoom >( lumina, parser.ReadColumn< ushort >( 0 + i ), language ); + DeepDungeonRoom[ i ] = new LazyRow< DeepDungeonRoom >( gameData, parser.ReadColumn< ushort >( 0 + i ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/DeepDungeonRoom.cs b/src/Lumina.Excel/GeneratedSheets/DeepDungeonRoom.cs index 1690e086..6f1bf807 100644 --- a/src/Lumina.Excel/GeneratedSheets/DeepDungeonRoom.cs +++ b/src/Lumina.Excel/GeneratedSheets/DeepDungeonRoom.cs @@ -7,22 +7,18 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "DeepDungeonRoom", columnHash: 0x6be0e840 )] - public class DeepDungeonRoom : IExcelRow + public class DeepDungeonRoom : ExcelRow { - public LazyRow< Level >[] Level; + public LazyRow< Level >[] Level { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Level = new LazyRow< Level >[ 5 ]; for( var i = 0; i < 5; i++ ) - Level[ i ] = new LazyRow< Level >( lumina, parser.ReadColumn< uint >( 0 + i ), language ); + Level[ i ] = new LazyRow< Level >( gameData, parser.ReadColumn< uint >( 0 + i ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/DeepDungeonStatus.cs b/src/Lumina.Excel/GeneratedSheets/DeepDungeonStatus.cs index 074f6082..ff2e11f1 100644 --- a/src/Lumina.Excel/GeneratedSheets/DeepDungeonStatus.cs +++ b/src/Lumina.Excel/GeneratedSheets/DeepDungeonStatus.cs @@ -7,24 +7,20 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "DeepDungeonStatus", columnHash: 0xdc23efe7 )] - public class DeepDungeonStatus : IExcelRow + public class DeepDungeonStatus : ExcelRow { - public LazyRow< ScreenImage > ScreenImage; - public LazyRow< LogMessage > LogMessage; - public LazyRow< DeepDungeonFloorEffectUI > Name; + public LazyRow< ScreenImage > ScreenImage { get; set; } + public LazyRow< LogMessage > LogMessage { get; set; } + public LazyRow< DeepDungeonFloorEffectUI > Name { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - ScreenImage = new LazyRow< ScreenImage >( lumina, parser.ReadColumn< ushort >( 0 ), language ); - LogMessage = new LazyRow< LogMessage >( lumina, parser.ReadColumn< ushort >( 1 ), language ); - Name = new LazyRow< DeepDungeonFloorEffectUI >( lumina, parser.ReadColumn< ushort >( 2 ), language ); + ScreenImage = new LazyRow< ScreenImage >( gameData, parser.ReadColumn< ushort >( 0 ), language ); + LogMessage = new LazyRow< LogMessage >( gameData, parser.ReadColumn< ushort >( 1 ), language ); + Name = new LazyRow< DeepDungeonFloorEffectUI >( gameData, parser.ReadColumn< ushort >( 2 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/DefaultTalk.cs b/src/Lumina.Excel/GeneratedSheets/DefaultTalk.cs index f2786f43..aebfd03b 100644 --- a/src/Lumina.Excel/GeneratedSheets/DefaultTalk.cs +++ b/src/Lumina.Excel/GeneratedSheets/DefaultTalk.cs @@ -7,36 +7,32 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "DefaultTalk", columnHash: 0xe6dec88d )] - public class DefaultTalk : IExcelRow + public class DefaultTalk : ExcelRow { - public uint Unknown0; - public byte Unknown1; - public byte Unknown2; - public byte Unknown3; - public byte Unknown4; - public LazyRow< ActionTimeline >[] ActionTimelinePose; - public byte Unknown8; - public byte Unknown9; - public byte Unknown10; - public ushort Unknown11; - public ushort Unknown12; - public ushort Unknown13; - public byte Unknown14; - public byte Unknown15; - public byte Unknown16; - public bool Unknown17; - public bool Unknown18; - public bool Unknown19; - public SeString[] Text; + public uint Unknown0 { get; set; } + public byte Unknown1 { get; set; } + public byte Unknown2 { get; set; } + public byte Unknown3 { get; set; } + public byte Unknown4 { get; set; } + public LazyRow< ActionTimeline >[] ActionTimelinePose { get; set; } + public byte Unknown8 { get; set; } + public byte Unknown9 { get; set; } + public byte Unknown10 { get; set; } + public ushort Unknown11 { get; set; } + public ushort Unknown12 { get; set; } + public ushort Unknown13 { get; set; } + public byte Unknown14 { get; set; } + public byte Unknown15 { get; set; } + public byte Unknown16 { get; set; } + public bool Unknown17 { get; set; } + public bool Unknown18 { get; set; } + public bool Unknown19 { get; set; } + public SeString[] Text { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< uint >( 0 ); Unknown1 = parser.ReadColumn< byte >( 1 ); @@ -45,7 +41,7 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) Unknown4 = parser.ReadColumn< byte >( 4 ); ActionTimelinePose = new LazyRow< ActionTimeline >[ 3 ]; for( var i = 0; i < 3; i++ ) - ActionTimelinePose[ i ] = new LazyRow< ActionTimeline >( lumina, parser.ReadColumn< ushort >( 5 + i ), language ); + ActionTimelinePose[ i ] = new LazyRow< ActionTimeline >( gameData, parser.ReadColumn< ushort >( 5 + i ), language ); Unknown8 = parser.ReadColumn< byte >( 8 ); Unknown9 = parser.ReadColumn< byte >( 9 ); Unknown10 = parser.ReadColumn< byte >( 10 ); diff --git a/src/Lumina.Excel/GeneratedSheets/DefaultTalkLipSyncType.cs b/src/Lumina.Excel/GeneratedSheets/DefaultTalkLipSyncType.cs index 7ccf2cfc..9bfc515a 100644 --- a/src/Lumina.Excel/GeneratedSheets/DefaultTalkLipSyncType.cs +++ b/src/Lumina.Excel/GeneratedSheets/DefaultTalkLipSyncType.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "DefaultTalkLipSyncType", columnHash: 0xda365c51 )] - public class DefaultTalkLipSyncType : IExcelRow + public class DefaultTalkLipSyncType : ExcelRow { - public LazyRow< ActionTimeline > ActionTimeline; + public LazyRow< ActionTimeline > ActionTimeline { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - ActionTimeline = new LazyRow< ActionTimeline >( lumina, parser.ReadColumn< int >( 0 ), language ); + ActionTimeline = new LazyRow< ActionTimeline >( gameData, parser.ReadColumn< int >( 0 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/DeliveryQuest.cs b/src/Lumina.Excel/GeneratedSheets/DeliveryQuest.cs index 483b6d57..cce5b428 100644 --- a/src/Lumina.Excel/GeneratedSheets/DeliveryQuest.cs +++ b/src/Lumina.Excel/GeneratedSheets/DeliveryQuest.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "DeliveryQuest", columnHash: 0xda365c51 )] - public class DeliveryQuest : IExcelRow + public class DeliveryQuest : ExcelRow { - public LazyRow< Quest > Quest; + public LazyRow< Quest > Quest { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Quest = new LazyRow< Quest >( lumina, parser.ReadColumn< int >( 0 ), language ); + Quest = new LazyRow< Quest >( gameData, parser.ReadColumn< int >( 0 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/Description.cs b/src/Lumina.Excel/GeneratedSheets/Description.cs index 9324a1b9..afd7f412 100644 --- a/src/Lumina.Excel/GeneratedSheets/Description.cs +++ b/src/Lumina.Excel/GeneratedSheets/Description.cs @@ -7,30 +7,26 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Description", columnHash: 0x1933868c )] - public class Description : IExcelRow + public class Description : ExcelRow { - public LazyRow< Quest > Quest; - public SeString TextLong; - public SeString TextShort; - public SeString TextCommentary; - public bool Unknown4; - public LazyRow< DescriptionSection > Section; + public LazyRow< Quest > Quest { get; set; } + public SeString TextLong { get; set; } + public SeString TextShort { get; set; } + public SeString TextCommentary { get; set; } + public bool Unknown4 { get; set; } + public LazyRow< DescriptionSection > Section { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Quest = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 0 ), language ); + Quest = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 0 ), language ); TextLong = parser.ReadColumn< SeString >( 1 ); TextShort = parser.ReadColumn< SeString >( 2 ); TextCommentary = parser.ReadColumn< SeString >( 3 ); Unknown4 = parser.ReadColumn< bool >( 4 ); - Section = new LazyRow< DescriptionSection >( lumina, parser.ReadColumn< uint >( 5 ), language ); + Section = new LazyRow< DescriptionSection >( gameData, parser.ReadColumn< uint >( 5 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/DescriptionPage.cs b/src/Lumina.Excel/GeneratedSheets/DescriptionPage.cs index b44b14f9..ef304d68 100644 --- a/src/Lumina.Excel/GeneratedSheets/DescriptionPage.cs +++ b/src/Lumina.Excel/GeneratedSheets/DescriptionPage.cs @@ -7,60 +7,56 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "DescriptionPage", columnHash: 0x70c6f175 )] - public class DescriptionPage : IExcelRow + public class DescriptionPage : ExcelRow { - public LazyRow< Quest > Quest; - public LazyRow< DescriptionString > Text1; - public uint Image1; - public LazyRow< DescriptionString > Text2; - public uint Image2; - public LazyRow< DescriptionString > Text3; - public uint Image3; - public LazyRow< DescriptionString > Text4; - public uint Image4; - public LazyRow< DescriptionString > Text5; - public uint Image5; - public LazyRow< DescriptionString > Text6; - public uint Image6; - public LazyRow< DescriptionString > Text7; - public uint Image7; - public LazyRow< DescriptionString > Text8; - public uint Image8; - public LazyRow< DescriptionString > Text9; - public uint Image9; - public ushort Unknown19; - public uint Unknown20; - public ushort Unknown21; - public uint Unknown22; - public ushort Unknown23; + public LazyRow< Quest > Quest { get; set; } + public LazyRow< DescriptionString > Text1 { get; set; } + public uint Image1 { get; set; } + public LazyRow< DescriptionString > Text2 { get; set; } + public uint Image2 { get; set; } + public LazyRow< DescriptionString > Text3 { get; set; } + public uint Image3 { get; set; } + public LazyRow< DescriptionString > Text4 { get; set; } + public uint Image4 { get; set; } + public LazyRow< DescriptionString > Text5 { get; set; } + public uint Image5 { get; set; } + public LazyRow< DescriptionString > Text6 { get; set; } + public uint Image6 { get; set; } + public LazyRow< DescriptionString > Text7 { get; set; } + public uint Image7 { get; set; } + public LazyRow< DescriptionString > Text8 { get; set; } + public uint Image8 { get; set; } + public LazyRow< DescriptionString > Text9 { get; set; } + public uint Image9 { get; set; } + public ushort Unknown19 { get; set; } + public uint Unknown20 { get; set; } + public ushort Unknown21 { get; set; } + public uint Unknown22 { get; set; } + public ushort Unknown23 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Quest = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 0 ), language ); - Text1 = new LazyRow< DescriptionString >( lumina, parser.ReadColumn< ushort >( 1 ), language ); + Quest = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 0 ), language ); + Text1 = new LazyRow< DescriptionString >( gameData, parser.ReadColumn< ushort >( 1 ), language ); Image1 = parser.ReadColumn< uint >( 2 ); - Text2 = new LazyRow< DescriptionString >( lumina, parser.ReadColumn< ushort >( 3 ), language ); + Text2 = new LazyRow< DescriptionString >( gameData, parser.ReadColumn< ushort >( 3 ), language ); Image2 = parser.ReadColumn< uint >( 4 ); - Text3 = new LazyRow< DescriptionString >( lumina, parser.ReadColumn< ushort >( 5 ), language ); + Text3 = new LazyRow< DescriptionString >( gameData, parser.ReadColumn< ushort >( 5 ), language ); Image3 = parser.ReadColumn< uint >( 6 ); - Text4 = new LazyRow< DescriptionString >( lumina, parser.ReadColumn< ushort >( 7 ), language ); + Text4 = new LazyRow< DescriptionString >( gameData, parser.ReadColumn< ushort >( 7 ), language ); Image4 = parser.ReadColumn< uint >( 8 ); - Text5 = new LazyRow< DescriptionString >( lumina, parser.ReadColumn< ushort >( 9 ), language ); + Text5 = new LazyRow< DescriptionString >( gameData, parser.ReadColumn< ushort >( 9 ), language ); Image5 = parser.ReadColumn< uint >( 10 ); - Text6 = new LazyRow< DescriptionString >( lumina, parser.ReadColumn< ushort >( 11 ), language ); + Text6 = new LazyRow< DescriptionString >( gameData, parser.ReadColumn< ushort >( 11 ), language ); Image6 = parser.ReadColumn< uint >( 12 ); - Text7 = new LazyRow< DescriptionString >( lumina, parser.ReadColumn< ushort >( 13 ), language ); + Text7 = new LazyRow< DescriptionString >( gameData, parser.ReadColumn< ushort >( 13 ), language ); Image7 = parser.ReadColumn< uint >( 14 ); - Text8 = new LazyRow< DescriptionString >( lumina, parser.ReadColumn< ushort >( 15 ), language ); + Text8 = new LazyRow< DescriptionString >( gameData, parser.ReadColumn< ushort >( 15 ), language ); Image8 = parser.ReadColumn< uint >( 16 ); - Text9 = new LazyRow< DescriptionString >( lumina, parser.ReadColumn< ushort >( 17 ), language ); + Text9 = new LazyRow< DescriptionString >( gameData, parser.ReadColumn< ushort >( 17 ), language ); Image9 = parser.ReadColumn< uint >( 18 ); Unknown19 = parser.ReadColumn< ushort >( 19 ); Unknown20 = parser.ReadColumn< uint >( 20 ); diff --git a/src/Lumina.Excel/GeneratedSheets/DescriptionSection.cs b/src/Lumina.Excel/GeneratedSheets/DescriptionSection.cs index fa90fa97..af67814e 100644 --- a/src/Lumina.Excel/GeneratedSheets/DescriptionSection.cs +++ b/src/Lumina.Excel/GeneratedSheets/DescriptionSection.cs @@ -7,22 +7,18 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "DescriptionSection", columnHash: 0x2020acf6 )] - public class DescriptionSection : IExcelRow + public class DescriptionSection : ExcelRow { - public LazyRow< DescriptionString > String; - public LazyRow< DescriptionPage > Page; + public LazyRow< DescriptionString > String { get; set; } + public LazyRow< DescriptionPage > Page { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - String = new LazyRow< DescriptionString >( lumina, parser.ReadColumn< ushort >( 0 ), language ); - Page = new LazyRow< DescriptionPage >( lumina, parser.ReadColumn< ushort >( 1 ), language ); + String = new LazyRow< DescriptionString >( gameData, parser.ReadColumn< ushort >( 0 ), language ); + Page = new LazyRow< DescriptionPage >( gameData, parser.ReadColumn< ushort >( 1 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/DescriptionString.cs b/src/Lumina.Excel/GeneratedSheets/DescriptionString.cs index a9fd0e15..96bafee3 100644 --- a/src/Lumina.Excel/GeneratedSheets/DescriptionString.cs +++ b/src/Lumina.Excel/GeneratedSheets/DescriptionString.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "DescriptionString", columnHash: 0xdebb20e3 )] - public class DescriptionString : IExcelRow + public class DescriptionString : ExcelRow { - public SeString Text; + public SeString Text { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Text = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/DisposalShop.cs b/src/Lumina.Excel/GeneratedSheets/DisposalShop.cs index d5cff558..3020d1ba 100644 --- a/src/Lumina.Excel/GeneratedSheets/DisposalShop.cs +++ b/src/Lumina.Excel/GeneratedSheets/DisposalShop.cs @@ -7,35 +7,31 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "DisposalShop", columnHash: 0xca43e122 )] - public class DisposalShop : IExcelRow + public class DisposalShop : ExcelRow { - public SeString ShopName; - public int Unknown1; - public int Unknown2; - public int Unknown3; - public int Unknown4; - public int Unknown5; - public int Unknown6; - public int Unknown7; - public int Unknown8; - public ushort Unknown9; - public ushort Unknown10; - public ushort Unknown11; - public ushort Unknown12; - public ushort Unknown13; - public ushort Unknown14; - public ushort Unknown15; - public ushort Unknown16; - public bool Unknown17; + public SeString ShopName { get; set; } + public int Unknown1 { get; set; } + public int Unknown2 { get; set; } + public int Unknown3 { get; set; } + public int Unknown4 { get; set; } + public int Unknown5 { get; set; } + public int Unknown6 { get; set; } + public int Unknown7 { get; set; } + public int Unknown8 { get; set; } + public ushort Unknown9 { get; set; } + public ushort Unknown10 { get; set; } + public ushort Unknown11 { get; set; } + public ushort Unknown12 { get; set; } + public ushort Unknown13 { get; set; } + public ushort Unknown14 { get; set; } + public ushort Unknown15 { get; set; } + public ushort Unknown16 { get; set; } + public bool Unknown17 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); ShopName = parser.ReadColumn< SeString >( 0 ); Unknown1 = parser.ReadColumn< int >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/DisposalShopFilterType.cs b/src/Lumina.Excel/GeneratedSheets/DisposalShopFilterType.cs index 5e04ce36..ae22d20b 100644 --- a/src/Lumina.Excel/GeneratedSheets/DisposalShopFilterType.cs +++ b/src/Lumina.Excel/GeneratedSheets/DisposalShopFilterType.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "DisposalShopFilterType", columnHash: 0xdebb20e3 )] - public class DisposalShopFilterType : IExcelRow + public class DisposalShopFilterType : ExcelRow { - public SeString Category; + public SeString Category { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Category = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/DisposalShopItem.cs b/src/Lumina.Excel/GeneratedSheets/DisposalShopItem.cs index 4b1fb4da..7254efb6 100644 --- a/src/Lumina.Excel/GeneratedSheets/DisposalShopItem.cs +++ b/src/Lumina.Excel/GeneratedSheets/DisposalShopItem.cs @@ -7,27 +7,23 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "DisposalShopItem", columnHash: 0x1990ed53 )] - public class DisposalShopItem : IExcelRow + public class DisposalShopItem : ExcelRow { - public LazyRow< Item > ItemDisposed; - public bool Unknown1; - public LazyRow< Item > ItemReceived; - public bool Unknown3; - public uint QuantityReceived; - public ushort Unknown5; + public LazyRow< Item > ItemDisposed { get; set; } + public bool Unknown1 { get; set; } + public LazyRow< Item > ItemReceived { get; set; } + public bool Unknown3 { get; set; } + public uint QuantityReceived { get; set; } + public ushort Unknown5 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - ItemDisposed = new LazyRow< Item >( lumina, parser.ReadColumn< int >( 0 ), language ); + ItemDisposed = new LazyRow< Item >( gameData, parser.ReadColumn< int >( 0 ), language ); Unknown1 = parser.ReadColumn< bool >( 1 ); - ItemReceived = new LazyRow< Item >( lumina, parser.ReadColumn< int >( 2 ), language ); + ItemReceived = new LazyRow< Item >( gameData, parser.ReadColumn< int >( 2 ), language ); Unknown3 = parser.ReadColumn< bool >( 3 ); QuantityReceived = parser.ReadColumn< uint >( 4 ); Unknown5 = parser.ReadColumn< ushort >( 5 ); diff --git a/src/Lumina.Excel/GeneratedSheets/DpsChallenge.cs b/src/Lumina.Excel/GeneratedSheets/DpsChallenge.cs index 94b8d6ab..fc9d9652 100644 --- a/src/Lumina.Excel/GeneratedSheets/DpsChallenge.cs +++ b/src/Lumina.Excel/GeneratedSheets/DpsChallenge.cs @@ -7,26 +7,22 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "DpsChallenge", columnHash: 0x944cf024 )] - public class DpsChallenge : IExcelRow + public class DpsChallenge : ExcelRow { - public ushort PlayerLevel; - public LazyRow< PlaceName > PlaceName; - public uint Icon; - public ushort Order; - public SeString Name; - public SeString Description; + public ushort PlayerLevel { get; set; } + public LazyRow< PlaceName > PlaceName { get; set; } + public uint Icon { get; set; } + public ushort Order { get; set; } + public SeString Name { get; set; } + public SeString Description { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); PlayerLevel = parser.ReadColumn< ushort >( 0 ); - PlaceName = new LazyRow< PlaceName >( lumina, parser.ReadColumn< ushort >( 1 ), language ); + PlaceName = new LazyRow< PlaceName >( gameData, parser.ReadColumn< ushort >( 1 ), language ); Icon = parser.ReadColumn< uint >( 2 ); Order = parser.ReadColumn< ushort >( 3 ); Name = parser.ReadColumn< SeString >( 4 ); diff --git a/src/Lumina.Excel/GeneratedSheets/DpsChallengeOfficer.cs b/src/Lumina.Excel/GeneratedSheets/DpsChallengeOfficer.cs index 90abfa9e..c46c0675 100644 --- a/src/Lumina.Excel/GeneratedSheets/DpsChallengeOfficer.cs +++ b/src/Lumina.Excel/GeneratedSheets/DpsChallengeOfficer.cs @@ -7,24 +7,20 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "DpsChallengeOfficer", columnHash: 0xef9733d1 )] - public class DpsChallengeOfficer : IExcelRow + public class DpsChallengeOfficer : ExcelRow { - public LazyRow< Quest > UnlockQuest; - public LazyRow< DpsChallenge >[] ChallengeName; + public LazyRow< Quest > UnlockQuest { get; set; } + public LazyRow< DpsChallenge >[] ChallengeName { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - UnlockQuest = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 0 ), language ); + UnlockQuest = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 0 ), language ); ChallengeName = new LazyRow< DpsChallenge >[ 25 ]; for( var i = 0; i < 25; i++ ) - ChallengeName[ i ] = new LazyRow< DpsChallenge >( lumina, parser.ReadColumn< ushort >( 1 + i ), language ); + ChallengeName[ i ] = new LazyRow< DpsChallenge >( gameData, parser.ReadColumn< ushort >( 1 + i ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/DpsChallengeTransient.cs b/src/Lumina.Excel/GeneratedSheets/DpsChallengeTransient.cs index a9c2806f..b662e43f 100644 --- a/src/Lumina.Excel/GeneratedSheets/DpsChallengeTransient.cs +++ b/src/Lumina.Excel/GeneratedSheets/DpsChallengeTransient.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "DpsChallengeTransient", columnHash: 0xd870e208 )] - public class DpsChallengeTransient : IExcelRow + public class DpsChallengeTransient : ExcelRow { - public LazyRow< InstanceContent > InstanceContent; + public LazyRow< InstanceContent > InstanceContent { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - InstanceContent = new LazyRow< InstanceContent >( lumina, parser.ReadColumn< ushort >( 0 ), language ); + InstanceContent = new LazyRow< InstanceContent >( gameData, parser.ReadColumn< ushort >( 0 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/DynamicEvent.cs b/src/Lumina.Excel/GeneratedSheets/DynamicEvent.cs index d3f57144..dbaa39d3 100644 --- a/src/Lumina.Excel/GeneratedSheets/DynamicEvent.cs +++ b/src/Lumina.Excel/GeneratedSheets/DynamicEvent.cs @@ -7,40 +7,36 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "DynamicEvent", columnHash: 0xb5601716 )] - public class DynamicEvent : IExcelRow + public class DynamicEvent : ExcelRow { - public LazyRow< DynamicEventType > EventType; - public LazyRow< DynamicEventEnemyType > EnemyType; - public byte Unknown2; - public byte Unknown3; - public uint LGBEventObject; - public uint LGBMapRange; - public LazyRow< Quest > Quest; - public byte Unknown7; - public LazyRow< DynamicEventSingleBattle > SingleBattle; - public LazyRow< LogMessage > Announce; - public SeString Name; - public SeString Description; + public LazyRow< DynamicEventType > EventType { get; set; } + public LazyRow< DynamicEventEnemyType > EnemyType { get; set; } + public byte Unknown2 { get; set; } + public byte Unknown3 { get; set; } + public uint LGBEventObject { get; set; } + public uint LGBMapRange { get; set; } + public LazyRow< Quest > Quest { get; set; } + public byte Unknown7 { get; set; } + public LazyRow< DynamicEventSingleBattle > SingleBattle { get; set; } + public LazyRow< LogMessage > Announce { get; set; } + public SeString Name { get; set; } + public SeString Description { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - EventType = new LazyRow< DynamicEventType >( lumina, parser.ReadColumn< byte >( 0 ), language ); - EnemyType = new LazyRow< DynamicEventEnemyType >( lumina, parser.ReadColumn< byte >( 1 ), language ); + EventType = new LazyRow< DynamicEventType >( gameData, parser.ReadColumn< byte >( 0 ), language ); + EnemyType = new LazyRow< DynamicEventEnemyType >( gameData, parser.ReadColumn< byte >( 1 ), language ); Unknown2 = parser.ReadColumn< byte >( 2 ); Unknown3 = parser.ReadColumn< byte >( 3 ); LGBEventObject = parser.ReadColumn< uint >( 4 ); LGBMapRange = parser.ReadColumn< uint >( 5 ); - Quest = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 6 ), language ); + Quest = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 6 ), language ); Unknown7 = parser.ReadColumn< byte >( 7 ); - SingleBattle = new LazyRow< DynamicEventSingleBattle >( lumina, parser.ReadColumn< byte >( 8 ), language ); - Announce = new LazyRow< LogMessage >( lumina, parser.ReadColumn< uint >( 9 ), language ); + SingleBattle = new LazyRow< DynamicEventSingleBattle >( gameData, parser.ReadColumn< byte >( 8 ), language ); + Announce = new LazyRow< LogMessage >( gameData, parser.ReadColumn< uint >( 9 ), language ); Name = parser.ReadColumn< SeString >( 10 ); Description = parser.ReadColumn< SeString >( 11 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/DynamicEventEnemyType.cs b/src/Lumina.Excel/GeneratedSheets/DynamicEventEnemyType.cs index f1289548..c4fde7c4 100644 --- a/src/Lumina.Excel/GeneratedSheets/DynamicEventEnemyType.cs +++ b/src/Lumina.Excel/GeneratedSheets/DynamicEventEnemyType.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "DynamicEventEnemyType", columnHash: 0xdebb20e3 )] - public class DynamicEventEnemyType : IExcelRow + public class DynamicEventEnemyType : ExcelRow { - public SeString Name; + public SeString Name { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/DynamicEventSingleBattle.cs b/src/Lumina.Excel/GeneratedSheets/DynamicEventSingleBattle.cs index 08790114..f71f0757 100644 --- a/src/Lumina.Excel/GeneratedSheets/DynamicEventSingleBattle.cs +++ b/src/Lumina.Excel/GeneratedSheets/DynamicEventSingleBattle.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "DynamicEventSingleBattle", columnHash: 0xe760c985 )] - public class DynamicEventSingleBattle : IExcelRow + public class DynamicEventSingleBattle : ExcelRow { - public int ActionIcon; - public uint Icon; - public SeString Text; + public int ActionIcon { get; set; } + public uint Icon { get; set; } + public SeString Text { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); ActionIcon = parser.ReadColumn< int >( 0 ); Icon = parser.ReadColumn< uint >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/DynamicEventType.cs b/src/Lumina.Excel/GeneratedSheets/DynamicEventType.cs index 84436025..6c39d088 100644 --- a/src/Lumina.Excel/GeneratedSheets/DynamicEventType.cs +++ b/src/Lumina.Excel/GeneratedSheets/DynamicEventType.cs @@ -7,22 +7,18 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "DynamicEventType", columnHash: 0x6be0e840 )] - public class DynamicEventType : IExcelRow + public class DynamicEventType : ExcelRow { - public uint IconObjective0; - public uint IconObjective1; - public uint Unknown2; - public uint Unknown3; - public uint Unknown4; + public uint IconObjective0 { get; set; } + public uint IconObjective1 { get; set; } + public uint Unknown2 { get; set; } + public uint Unknown3 { get; set; } + public uint Unknown4 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); IconObjective0 = parser.ReadColumn< uint >( 0 ); IconObjective1 = parser.ReadColumn< uint >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/ENpcBase.cs b/src/Lumina.Excel/GeneratedSheets/ENpcBase.cs index 6c4b69cc..ac66f649 100644 --- a/src/Lumina.Excel/GeneratedSheets/ENpcBase.cs +++ b/src/Lumina.Excel/GeneratedSheets/ENpcBase.cs @@ -7,81 +7,77 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ENpcBase", columnHash: 0x927347d8 )] - public class ENpcBase : IExcelRow + public class ENpcBase : ExcelRow { - public ushort EventHandler; - public bool Important; - public uint[] ENpcData; - public float Scale; - public LazyRow< ModelChara > ModelChara; - public LazyRow< Race > Race; - public byte Gender; - public byte BodyType; - public byte Height; - public LazyRow< Tribe > Tribe; - public byte Face; - public byte HairStyle; - public byte HairHighlight; - public byte SkinColor; - public byte EyeHeterochromia; - public byte HairColor; - public byte HairHighlightColor; - public byte FacialFeature; - public byte FacialFeatureColor; - public byte Eyebrows; - public byte EyeColor; - public byte EyeShape; - public byte Nose; - public byte Jaw; - public byte Mouth; - public byte LipColor; - public byte BustOrTone1; - public byte ExtraFeature1; - public byte ExtraFeature2OrBust; - public byte FacePaint; - public byte FacePaintColor; - public byte Unknown62; - public LazyRow< NpcEquip > NpcEquip; - public LazyRow< Behavior > Behavior; - public ulong ModelMainHand; - public LazyRow< Stain > DyeMainHand; - public ulong ModelOffHand; - public LazyRow< Stain > DyeOffHand; - public uint ModelHead; - public LazyRow< Stain > DyeHead; - public bool Visor; - public uint ModelBody; - public LazyRow< Stain > DyeBody; - public uint ModelHands; - public LazyRow< Stain > DyeHands; - public uint ModelLegs; - public LazyRow< Stain > DyeLegs; - public uint ModelFeet; - public LazyRow< Stain > DyeFeet; - public uint ModelEars; - public LazyRow< Stain > DyeEars; - public uint ModelNeck; - public LazyRow< Stain > DyeNeck; - public uint ModelWrists; - public LazyRow< Stain > DyeWrists; - public uint ModelLeftRing; - public LazyRow< Stain > DyeLeftRing; - public uint ModelRightRing; - public LazyRow< Stain > DyeRightRing; - public byte Invisibility; - public LazyRow< Balloon > Balloon; - public bool NotRewriteHeight; - public byte DefaultBalloon; - public byte Unknown94; + public ushort EventHandler { get; set; } + public bool Important { get; set; } + public uint[] ENpcData { get; set; } + public float Scale { get; set; } + public LazyRow< ModelChara > ModelChara { get; set; } + public LazyRow< Race > Race { get; set; } + public byte Gender { get; set; } + public byte BodyType { get; set; } + public byte Height { get; set; } + public LazyRow< Tribe > Tribe { get; set; } + public byte Face { get; set; } + public byte HairStyle { get; set; } + public byte HairHighlight { get; set; } + public byte SkinColor { get; set; } + public byte EyeHeterochromia { get; set; } + public byte HairColor { get; set; } + public byte HairHighlightColor { get; set; } + public byte FacialFeature { get; set; } + public byte FacialFeatureColor { get; set; } + public byte Eyebrows { get; set; } + public byte EyeColor { get; set; } + public byte EyeShape { get; set; } + public byte Nose { get; set; } + public byte Jaw { get; set; } + public byte Mouth { get; set; } + public byte LipColor { get; set; } + public byte BustOrTone1 { get; set; } + public byte ExtraFeature1 { get; set; } + public byte ExtraFeature2OrBust { get; set; } + public byte FacePaint { get; set; } + public byte FacePaintColor { get; set; } + public byte Unknown62 { get; set; } + public LazyRow< NpcEquip > NpcEquip { get; set; } + public LazyRow< Behavior > Behavior { get; set; } + public ulong ModelMainHand { get; set; } + public LazyRow< Stain > DyeMainHand { get; set; } + public ulong ModelOffHand { get; set; } + public LazyRow< Stain > DyeOffHand { get; set; } + public uint ModelHead { get; set; } + public LazyRow< Stain > DyeHead { get; set; } + public bool Visor { get; set; } + public uint ModelBody { get; set; } + public LazyRow< Stain > DyeBody { get; set; } + public uint ModelHands { get; set; } + public LazyRow< Stain > DyeHands { get; set; } + public uint ModelLegs { get; set; } + public LazyRow< Stain > DyeLegs { get; set; } + public uint ModelFeet { get; set; } + public LazyRow< Stain > DyeFeet { get; set; } + public uint ModelEars { get; set; } + public LazyRow< Stain > DyeEars { get; set; } + public uint ModelNeck { get; set; } + public LazyRow< Stain > DyeNeck { get; set; } + public uint ModelWrists { get; set; } + public LazyRow< Stain > DyeWrists { get; set; } + public uint ModelLeftRing { get; set; } + public LazyRow< Stain > DyeLeftRing { get; set; } + public uint ModelRightRing { get; set; } + public LazyRow< Stain > DyeRightRing { get; set; } + public byte Invisibility { get; set; } + public LazyRow< Balloon > Balloon { get; set; } + public bool NotRewriteHeight { get; set; } + public byte DefaultBalloon { get; set; } + public byte Unknown94 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); EventHandler = parser.ReadColumn< ushort >( 0 ); Important = parser.ReadColumn< bool >( 1 ); @@ -89,12 +85,12 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) for( var i = 0; i < 32; i++ ) ENpcData[ i ] = parser.ReadColumn< uint >( 2 + i ); Scale = parser.ReadColumn< float >( 34 ); - ModelChara = new LazyRow< ModelChara >( lumina, parser.ReadColumn< ushort >( 35 ), language ); - Race = new LazyRow< Race >( lumina, parser.ReadColumn< byte >( 36 ), language ); + ModelChara = new LazyRow< ModelChara >( gameData, parser.ReadColumn< ushort >( 35 ), language ); + Race = new LazyRow< Race >( gameData, parser.ReadColumn< byte >( 36 ), language ); Gender = parser.ReadColumn< byte >( 37 ); BodyType = parser.ReadColumn< byte >( 38 ); Height = parser.ReadColumn< byte >( 39 ); - Tribe = new LazyRow< Tribe >( lumina, parser.ReadColumn< byte >( 40 ), language ); + Tribe = new LazyRow< Tribe >( gameData, parser.ReadColumn< byte >( 40 ), language ); Face = parser.ReadColumn< byte >( 41 ); HairStyle = parser.ReadColumn< byte >( 42 ); HairHighlight = parser.ReadColumn< byte >( 43 ); @@ -117,35 +113,35 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) FacePaint = parser.ReadColumn< byte >( 60 ); FacePaintColor = parser.ReadColumn< byte >( 61 ); Unknown62 = parser.ReadColumn< byte >( 62 ); - NpcEquip = new LazyRow< NpcEquip >( lumina, parser.ReadColumn< ushort >( 63 ), language ); - Behavior = new LazyRow< Behavior >( lumina, parser.ReadColumn< ushort >( 64 ), language ); + NpcEquip = new LazyRow< NpcEquip >( gameData, parser.ReadColumn< ushort >( 63 ), language ); + Behavior = new LazyRow< Behavior >( gameData, parser.ReadColumn< ushort >( 64 ), language ); ModelMainHand = parser.ReadColumn< ulong >( 65 ); - DyeMainHand = new LazyRow< Stain >( lumina, parser.ReadColumn< byte >( 66 ), language ); + DyeMainHand = new LazyRow< Stain >( gameData, parser.ReadColumn< byte >( 66 ), language ); ModelOffHand = parser.ReadColumn< ulong >( 67 ); - DyeOffHand = new LazyRow< Stain >( lumina, parser.ReadColumn< byte >( 68 ), language ); + DyeOffHand = new LazyRow< Stain >( gameData, parser.ReadColumn< byte >( 68 ), language ); ModelHead = parser.ReadColumn< uint >( 69 ); - DyeHead = new LazyRow< Stain >( lumina, parser.ReadColumn< byte >( 70 ), language ); + DyeHead = new LazyRow< Stain >( gameData, parser.ReadColumn< byte >( 70 ), language ); Visor = parser.ReadColumn< bool >( 71 ); ModelBody = parser.ReadColumn< uint >( 72 ); - DyeBody = new LazyRow< Stain >( lumina, parser.ReadColumn< byte >( 73 ), language ); + DyeBody = new LazyRow< Stain >( gameData, parser.ReadColumn< byte >( 73 ), language ); ModelHands = parser.ReadColumn< uint >( 74 ); - DyeHands = new LazyRow< Stain >( lumina, parser.ReadColumn< byte >( 75 ), language ); + DyeHands = new LazyRow< Stain >( gameData, parser.ReadColumn< byte >( 75 ), language ); ModelLegs = parser.ReadColumn< uint >( 76 ); - DyeLegs = new LazyRow< Stain >( lumina, parser.ReadColumn< byte >( 77 ), language ); + DyeLegs = new LazyRow< Stain >( gameData, parser.ReadColumn< byte >( 77 ), language ); ModelFeet = parser.ReadColumn< uint >( 78 ); - DyeFeet = new LazyRow< Stain >( lumina, parser.ReadColumn< byte >( 79 ), language ); + DyeFeet = new LazyRow< Stain >( gameData, parser.ReadColumn< byte >( 79 ), language ); ModelEars = parser.ReadColumn< uint >( 80 ); - DyeEars = new LazyRow< Stain >( lumina, parser.ReadColumn< byte >( 81 ), language ); + DyeEars = new LazyRow< Stain >( gameData, parser.ReadColumn< byte >( 81 ), language ); ModelNeck = parser.ReadColumn< uint >( 82 ); - DyeNeck = new LazyRow< Stain >( lumina, parser.ReadColumn< byte >( 83 ), language ); + DyeNeck = new LazyRow< Stain >( gameData, parser.ReadColumn< byte >( 83 ), language ); ModelWrists = parser.ReadColumn< uint >( 84 ); - DyeWrists = new LazyRow< Stain >( lumina, parser.ReadColumn< byte >( 85 ), language ); + DyeWrists = new LazyRow< Stain >( gameData, parser.ReadColumn< byte >( 85 ), language ); ModelLeftRing = parser.ReadColumn< uint >( 86 ); - DyeLeftRing = new LazyRow< Stain >( lumina, parser.ReadColumn< byte >( 87 ), language ); + DyeLeftRing = new LazyRow< Stain >( gameData, parser.ReadColumn< byte >( 87 ), language ); ModelRightRing = parser.ReadColumn< uint >( 88 ); - DyeRightRing = new LazyRow< Stain >( lumina, parser.ReadColumn< byte >( 89 ), language ); + DyeRightRing = new LazyRow< Stain >( gameData, parser.ReadColumn< byte >( 89 ), language ); Invisibility = parser.ReadColumn< byte >( 90 ); - Balloon = new LazyRow< Balloon >( lumina, parser.ReadColumn< ushort >( 91 ), language ); + Balloon = new LazyRow< Balloon >( gameData, parser.ReadColumn< ushort >( 91 ), language ); NotRewriteHeight = parser.ReadColumn< bool >( 92 ); DefaultBalloon = parser.ReadColumn< byte >( 93 ); Unknown94 = parser.ReadColumn< byte >( 94 ); diff --git a/src/Lumina.Excel/GeneratedSheets/ENpcDressUp.cs b/src/Lumina.Excel/GeneratedSheets/ENpcDressUp.cs index 044ac936..fcab760c 100644 --- a/src/Lumina.Excel/GeneratedSheets/ENpcDressUp.cs +++ b/src/Lumina.Excel/GeneratedSheets/ENpcDressUp.cs @@ -7,22 +7,18 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ENpcDressUp", columnHash: 0xde74b4c4 )] - public class ENpcDressUp : IExcelRow + public class ENpcDressUp : ExcelRow { - public byte Unknown0; - public LazyRow< ENpcDressUpDress > ENpcDressUpDress; + public byte Unknown0 { get; set; } + public LazyRow< ENpcDressUpDress > ENpcDressUpDress { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< byte >( 0 ); - ENpcDressUpDress = new LazyRow< ENpcDressUpDress >( lumina, parser.ReadColumn< byte >( 1 ), language ); + ENpcDressUpDress = new LazyRow< ENpcDressUpDress >( gameData, parser.ReadColumn< byte >( 1 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/ENpcDressUpDress.cs b/src/Lumina.Excel/GeneratedSheets/ENpcDressUpDress.cs index f3473751..5ca779c6 100644 --- a/src/Lumina.Excel/GeneratedSheets/ENpcDressUpDress.cs +++ b/src/Lumina.Excel/GeneratedSheets/ENpcDressUpDress.cs @@ -7,78 +7,74 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ENpcDressUpDress", columnHash: 0xd0267043 )] - public class ENpcDressUpDress : IExcelRow + public class ENpcDressUpDress : ExcelRow { - public uint Unknown0; - public bool Unknown1; - public bool Unknown2; - public bool Unknown3; - public bool Unknown4; - public bool AddedIn530; - public byte Unknown6; - public LazyRow< ENpcResident > ENpc; - public ushort AddedIn531; - public LazyRow< Behavior > Behavior; - public ushort Unknown10; - public byte Unknown11; - public byte Unknown12; - public byte Unknown13; - public byte Unknown14; - public byte Unknown15; - public byte Unknown16; - public byte Unknown17; - public byte Unknown18; - public byte Unknown19; - public byte Unknown20; - public byte Unknown21; - public byte Unknown22; - public byte Unknown23; - public byte Unknown24; - public byte Unknown25; - public byte Unknown26; - public byte Unknown27; - public byte Unknown28; - public byte Unknown29; - public byte Unknown30; - public byte Unknown31; - public byte Unknown32; - public byte Unknown33; - public byte Unknown34; - public byte Unknown35; - public byte AddedIn532; - public ulong ModelMainHand; - public LazyRow< Stain > DyeMainHand; - public ulong ModelOffHand; - public LazyRow< Stain > DyeOffHand; - public uint ModelHead; - public LazyRow< Stain > DyeHead; - public uint ModelBody; - public LazyRow< Stain > DyeBody; - public uint ModelHands; - public LazyRow< Stain > DyeHands; - public uint ModelLegs; - public LazyRow< Stain > DyeLegs; - public uint ModelFeet; - public LazyRow< Stain > DyeFeet; - public uint Unknown51; - public byte Unknown52; - public uint Unknown53; - public byte Unknown54; - public uint Unknown55; - public byte Unknown56; - public uint Unknown57; - public byte Unknown58; - public uint Unknown59; - public byte Unknown60; + public uint Unknown0 { get; set; } + public bool Unknown1 { get; set; } + public bool Unknown2 { get; set; } + public bool Unknown3 { get; set; } + public bool Unknown4 { get; set; } + public bool AddedIn530 { get; set; } + public byte Unknown6 { get; set; } + public LazyRow< ENpcResident > ENpc { get; set; } + public ushort AddedIn531 { get; set; } + public LazyRow< Behavior > Behavior { get; set; } + public ushort Unknown10 { get; set; } + public byte Unknown11 { get; set; } + public byte Unknown12 { get; set; } + public byte Unknown13 { get; set; } + public byte Unknown14 { get; set; } + public byte Unknown15 { get; set; } + public byte Unknown16 { get; set; } + public byte Unknown17 { get; set; } + public byte Unknown18 { get; set; } + public byte Unknown19 { get; set; } + public byte Unknown20 { get; set; } + public byte Unknown21 { get; set; } + public byte Unknown22 { get; set; } + public byte Unknown23 { get; set; } + public byte Unknown24 { get; set; } + public byte Unknown25 { get; set; } + public byte Unknown26 { get; set; } + public byte Unknown27 { get; set; } + public byte Unknown28 { get; set; } + public byte Unknown29 { get; set; } + public byte Unknown30 { get; set; } + public byte Unknown31 { get; set; } + public byte Unknown32 { get; set; } + public byte Unknown33 { get; set; } + public byte Unknown34 { get; set; } + public byte Unknown35 { get; set; } + public byte AddedIn532 { get; set; } + public ulong ModelMainHand { get; set; } + public LazyRow< Stain > DyeMainHand { get; set; } + public ulong ModelOffHand { get; set; } + public LazyRow< Stain > DyeOffHand { get; set; } + public uint ModelHead { get; set; } + public LazyRow< Stain > DyeHead { get; set; } + public uint ModelBody { get; set; } + public LazyRow< Stain > DyeBody { get; set; } + public uint ModelHands { get; set; } + public LazyRow< Stain > DyeHands { get; set; } + public uint ModelLegs { get; set; } + public LazyRow< Stain > DyeLegs { get; set; } + public uint ModelFeet { get; set; } + public LazyRow< Stain > DyeFeet { get; set; } + public uint Unknown51 { get; set; } + public byte Unknown52 { get; set; } + public uint Unknown53 { get; set; } + public byte Unknown54 { get; set; } + public uint Unknown55 { get; set; } + public byte Unknown56 { get; set; } + public uint Unknown57 { get; set; } + public byte Unknown58 { get; set; } + public uint Unknown59 { get; set; } + public byte Unknown60 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< uint >( 0 ); Unknown1 = parser.ReadColumn< bool >( 1 ); @@ -87,9 +83,9 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) Unknown4 = parser.ReadColumn< bool >( 4 ); AddedIn530 = parser.ReadColumn< bool >( 5 ); Unknown6 = parser.ReadColumn< byte >( 6 ); - ENpc = new LazyRow< ENpcResident >( lumina, parser.ReadColumn< uint >( 7 ), language ); + ENpc = new LazyRow< ENpcResident >( gameData, parser.ReadColumn< uint >( 7 ), language ); AddedIn531 = parser.ReadColumn< ushort >( 8 ); - Behavior = new LazyRow< Behavior >( lumina, parser.ReadColumn< ushort >( 9 ), language ); + Behavior = new LazyRow< Behavior >( gameData, parser.ReadColumn< ushort >( 9 ), language ); Unknown10 = parser.ReadColumn< ushort >( 10 ); Unknown11 = parser.ReadColumn< byte >( 11 ); Unknown12 = parser.ReadColumn< byte >( 12 ); @@ -118,19 +114,19 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) Unknown35 = parser.ReadColumn< byte >( 35 ); AddedIn532 = parser.ReadColumn< byte >( 36 ); ModelMainHand = parser.ReadColumn< ulong >( 37 ); - DyeMainHand = new LazyRow< Stain >( lumina, parser.ReadColumn< byte >( 38 ), language ); + DyeMainHand = new LazyRow< Stain >( gameData, parser.ReadColumn< byte >( 38 ), language ); ModelOffHand = parser.ReadColumn< ulong >( 39 ); - DyeOffHand = new LazyRow< Stain >( lumina, parser.ReadColumn< byte >( 40 ), language ); + DyeOffHand = new LazyRow< Stain >( gameData, parser.ReadColumn< byte >( 40 ), language ); ModelHead = parser.ReadColumn< uint >( 41 ); - DyeHead = new LazyRow< Stain >( lumina, parser.ReadColumn< byte >( 42 ), language ); + DyeHead = new LazyRow< Stain >( gameData, parser.ReadColumn< byte >( 42 ), language ); ModelBody = parser.ReadColumn< uint >( 43 ); - DyeBody = new LazyRow< Stain >( lumina, parser.ReadColumn< byte >( 44 ), language ); + DyeBody = new LazyRow< Stain >( gameData, parser.ReadColumn< byte >( 44 ), language ); ModelHands = parser.ReadColumn< uint >( 45 ); - DyeHands = new LazyRow< Stain >( lumina, parser.ReadColumn< byte >( 46 ), language ); + DyeHands = new LazyRow< Stain >( gameData, parser.ReadColumn< byte >( 46 ), language ); ModelLegs = parser.ReadColumn< uint >( 47 ); - DyeLegs = new LazyRow< Stain >( lumina, parser.ReadColumn< byte >( 48 ), language ); + DyeLegs = new LazyRow< Stain >( gameData, parser.ReadColumn< byte >( 48 ), language ); ModelFeet = parser.ReadColumn< uint >( 49 ); - DyeFeet = new LazyRow< Stain >( lumina, parser.ReadColumn< byte >( 50 ), language ); + DyeFeet = new LazyRow< Stain >( gameData, parser.ReadColumn< byte >( 50 ), language ); Unknown51 = parser.ReadColumn< uint >( 51 ); Unknown52 = parser.ReadColumn< byte >( 52 ); Unknown53 = parser.ReadColumn< uint >( 53 ); diff --git a/src/Lumina.Excel/GeneratedSheets/ENpcResident.cs b/src/Lumina.Excel/GeneratedSheets/ENpcResident.cs index 1fc7aaf9..4d7286da 100644 --- a/src/Lumina.Excel/GeneratedSheets/ENpcResident.cs +++ b/src/Lumina.Excel/GeneratedSheets/ENpcResident.cs @@ -7,28 +7,24 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ENpcResident", columnHash: 0xf74fa88c )] - public class ENpcResident : IExcelRow + public class ENpcResident : ExcelRow { - public SeString Singular; - public sbyte Adjective; - public SeString Plural; - public sbyte PossessivePronoun; - public sbyte StartsWithVowel; - public sbyte Unknown5; - public sbyte Pronoun; - public sbyte Article; - public SeString Title; - public byte Map; - public bool Unknown10; + public SeString Singular { get; set; } + public sbyte Adjective { get; set; } + public SeString Plural { get; set; } + public sbyte PossessivePronoun { get; set; } + public sbyte StartsWithVowel { get; set; } + public sbyte Unknown5 { get; set; } + public sbyte Pronoun { get; set; } + public sbyte Article { get; set; } + public SeString Title { get; set; } + public byte Map { get; set; } + public bool Unknown10 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Singular = parser.ReadColumn< SeString >( 0 ); Adjective = parser.ReadColumn< sbyte >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/EObj.cs b/src/Lumina.Excel/GeneratedSheets/EObj.cs index cafe90a9..e1d2b3f4 100644 --- a/src/Lumina.Excel/GeneratedSheets/EObj.cs +++ b/src/Lumina.Excel/GeneratedSheets/EObj.cs @@ -7,36 +7,32 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "EObj", columnHash: 0xa71f030e )] - public class EObj : IExcelRow + public class EObj : ExcelRow { - public bool Unknown0; - public bool Unknown1; - public bool Unknown2; - public bool Unknown3; - public bool Unknown4; - public bool Unknown5; - public bool Unknown6; - public bool Unknown7; - public byte PopType; - public uint Data; - public byte Invisibility; - public LazyRow< ExportedSG > SgbPath; - public bool EyeCollision; - public bool DirectorControl; - public bool Target; - public byte EventHighAddition; - public bool Unknown16; - public byte Unknown17; - public bool AddedIn53; + public bool Unknown0 { get; set; } + public bool Unknown1 { get; set; } + public bool Unknown2 { get; set; } + public bool Unknown3 { get; set; } + public bool Unknown4 { get; set; } + public bool Unknown5 { get; set; } + public bool Unknown6 { get; set; } + public bool Unknown7 { get; set; } + public byte PopType { get; set; } + public uint Data { get; set; } + public byte Invisibility { get; set; } + public LazyRow< ExportedSG > SgbPath { get; set; } + public bool EyeCollision { get; set; } + public bool DirectorControl { get; set; } + public bool Target { get; set; } + public byte EventHighAddition { get; set; } + public bool Unknown16 { get; set; } + public byte Unknown17 { get; set; } + public bool AddedIn53 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< bool >( 0 ); Unknown1 = parser.ReadColumn< bool >( 1 ); @@ -49,7 +45,7 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) PopType = parser.ReadColumn< byte >( 8 ); Data = parser.ReadColumn< uint >( 9 ); Invisibility = parser.ReadColumn< byte >( 10 ); - SgbPath = new LazyRow< ExportedSG >( lumina, parser.ReadColumn< ushort >( 11 ), language ); + SgbPath = new LazyRow< ExportedSG >( gameData, parser.ReadColumn< ushort >( 11 ), language ); EyeCollision = parser.ReadColumn< bool >( 12 ); DirectorControl = parser.ReadColumn< bool >( 13 ); Target = parser.ReadColumn< bool >( 14 ); diff --git a/src/Lumina.Excel/GeneratedSheets/EObjName.cs b/src/Lumina.Excel/GeneratedSheets/EObjName.cs index 6c2693f7..d450b5e8 100644 --- a/src/Lumina.Excel/GeneratedSheets/EObjName.cs +++ b/src/Lumina.Excel/GeneratedSheets/EObjName.cs @@ -7,25 +7,21 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "EObjName", columnHash: 0x77a72da0 )] - public class EObjName : IExcelRow + public class EObjName : ExcelRow { - public SeString Singular; - public sbyte Adjective; - public SeString Plural; - public sbyte PossessivePronoun; - public sbyte StartsWithVowel; - public sbyte Unknown5; - public sbyte Pronoun; - public sbyte Article; + public SeString Singular { get; set; } + public sbyte Adjective { get; set; } + public SeString Plural { get; set; } + public sbyte PossessivePronoun { get; set; } + public sbyte StartsWithVowel { get; set; } + public sbyte Unknown5 { get; set; } + public sbyte Pronoun { get; set; } + public sbyte Article { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Singular = parser.ReadColumn< SeString >( 0 ); Adjective = parser.ReadColumn< sbyte >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/EmjAddon.cs b/src/Lumina.Excel/GeneratedSheets/EmjAddon.cs index 1f573a6a..d5609e6c 100644 --- a/src/Lumina.Excel/GeneratedSheets/EmjAddon.cs +++ b/src/Lumina.Excel/GeneratedSheets/EmjAddon.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "EmjAddon", columnHash: 0xdebb20e3 )] - public class EmjAddon : IExcelRow + public class EmjAddon : ExcelRow { - public SeString Text; + public SeString Text { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Text = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/EmjDani.cs b/src/Lumina.Excel/GeneratedSheets/EmjDani.cs index 4d9b630a..49958ecb 100644 --- a/src/Lumina.Excel/GeneratedSheets/EmjDani.cs +++ b/src/Lumina.Excel/GeneratedSheets/EmjDani.cs @@ -7,29 +7,25 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "EmjDani", columnHash: 0xf3fb0152 )] - public class EmjDani : IExcelRow + public class EmjDani : ExcelRow { - public uint Icon; - public ushort Unknown1; - public ushort Unknown2; - public bool Unknown3; - public short Unknown4; - public short Unknown5; - public short Unknown6; - public short Unknown7; - public short Unknown8; - public short Unknown9; - public short Unknown10; - public short Unknown11; + public uint Icon { get; set; } + public ushort Unknown1 { get; set; } + public ushort Unknown2 { get; set; } + public bool Unknown3 { get; set; } + public short Unknown4 { get; set; } + public short Unknown5 { get; set; } + public short Unknown6 { get; set; } + public short Unknown7 { get; set; } + public short Unknown8 { get; set; } + public short Unknown9 { get; set; } + public short Unknown10 { get; set; } + public short Unknown11 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Icon = parser.ReadColumn< uint >( 0 ); Unknown1 = parser.ReadColumn< ushort >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/Emote.cs b/src/Lumina.Excel/GeneratedSheets/Emote.cs index f81f91d1..2be8dba1 100644 --- a/src/Lumina.Excel/GeneratedSheets/Emote.cs +++ b/src/Lumina.Excel/GeneratedSheets/Emote.cs @@ -7,53 +7,49 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Emote", columnHash: 0xc4735d67 )] - public class Emote : IExcelRow + public class Emote : ExcelRow { - public SeString Name; - public LazyRow< ActionTimeline >[] ActionTimeline; - public bool Unknown8; - public bool Unknown9; - public bool Unknown10; - public LazyRow< EmoteCategory > EmoteCategory; - public LazyRow< EmoteMode > EmoteMode; - public bool Unknown13; - public bool Unknown14; - public bool HasCancelEmote; - public bool DrawsWeapon; - public ushort Unknown17; - public LazyRow< TextCommand > TextCommand; - public ushort Icon; - public LazyRow< LogMessage > LogMessageTargeted; - public LazyRow< LogMessage > LogMessageUntargeted; - public uint UnlockLink; + public SeString Name { get; set; } + public LazyRow< ActionTimeline >[] ActionTimeline { get; set; } + public bool Unknown8 { get; set; } + public bool Unknown9 { get; set; } + public bool Unknown10 { get; set; } + public LazyRow< EmoteCategory > EmoteCategory { get; set; } + public LazyRow< EmoteMode > EmoteMode { get; set; } + public bool Unknown13 { get; set; } + public bool Unknown14 { get; set; } + public bool HasCancelEmote { get; set; } + public bool DrawsWeapon { get; set; } + public ushort Order { get; set; } + public LazyRow< TextCommand > TextCommand { get; set; } + public ushort Icon { get; set; } + public LazyRow< LogMessage > LogMessageTargeted { get; set; } + public LazyRow< LogMessage > LogMessageUntargeted { get; set; } + public uint UnlockLink { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); ActionTimeline = new LazyRow< ActionTimeline >[ 7 ]; for( var i = 0; i < 7; i++ ) - ActionTimeline[ i ] = new LazyRow< ActionTimeline >( lumina, parser.ReadColumn< ushort >( 1 + i ), language ); + ActionTimeline[ i ] = new LazyRow< ActionTimeline >( gameData, parser.ReadColumn< ushort >( 1 + i ), language ); Unknown8 = parser.ReadColumn< bool >( 8 ); Unknown9 = parser.ReadColumn< bool >( 9 ); Unknown10 = parser.ReadColumn< bool >( 10 ); - EmoteCategory = new LazyRow< EmoteCategory >( lumina, parser.ReadColumn< byte >( 11 ), language ); - EmoteMode = new LazyRow< EmoteMode >( lumina, parser.ReadColumn< byte >( 12 ), language ); + EmoteCategory = new LazyRow< EmoteCategory >( gameData, parser.ReadColumn< byte >( 11 ), language ); + EmoteMode = new LazyRow< EmoteMode >( gameData, parser.ReadColumn< byte >( 12 ), language ); Unknown13 = parser.ReadColumn< bool >( 13 ); Unknown14 = parser.ReadColumn< bool >( 14 ); HasCancelEmote = parser.ReadColumn< bool >( 15 ); DrawsWeapon = parser.ReadColumn< bool >( 16 ); - Unknown17 = parser.ReadColumn< ushort >( 17 ); - TextCommand = new LazyRow< TextCommand >( lumina, parser.ReadColumn< int >( 18 ), language ); + Order = parser.ReadColumn< ushort >( 17 ); + TextCommand = new LazyRow< TextCommand >( gameData, parser.ReadColumn< int >( 18 ), language ); Icon = parser.ReadColumn< ushort >( 19 ); - LogMessageTargeted = new LazyRow< LogMessage >( lumina, parser.ReadColumn< ushort >( 20 ), language ); - LogMessageUntargeted = new LazyRow< LogMessage >( lumina, parser.ReadColumn< ushort >( 21 ), language ); + LogMessageTargeted = new LazyRow< LogMessage >( gameData, parser.ReadColumn< ushort >( 20 ), language ); + LogMessageUntargeted = new LazyRow< LogMessage >( gameData, parser.ReadColumn< ushort >( 21 ), language ); UnlockLink = parser.ReadColumn< uint >( 22 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/EmoteCategory.cs b/src/Lumina.Excel/GeneratedSheets/EmoteCategory.cs index ad77c156..3101374a 100644 --- a/src/Lumina.Excel/GeneratedSheets/EmoteCategory.cs +++ b/src/Lumina.Excel/GeneratedSheets/EmoteCategory.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "EmoteCategory", columnHash: 0xdebb20e3 )] - public class EmoteCategory : IExcelRow + public class EmoteCategory : ExcelRow { - public SeString Name; + public SeString Name { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/EmoteMode.cs b/src/Lumina.Excel/GeneratedSheets/EmoteMode.cs index d1759c6a..38aeaffd 100644 --- a/src/Lumina.Excel/GeneratedSheets/EmoteMode.cs +++ b/src/Lumina.Excel/GeneratedSheets/EmoteMode.cs @@ -7,28 +7,24 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "EmoteMode", columnHash: 0x087a32e7 )] - public class EmoteMode : IExcelRow + public class EmoteMode : ExcelRow { - public LazyRow< Emote > StartEmote; - public LazyRow< Emote > EndEmote; - public bool Move; - public bool Camera; - public bool EndOnRotate; - public bool EndOnEmote; - public byte ConditionMode; - public bool Unknown7; + public LazyRow< Emote > StartEmote { get; set; } + public LazyRow< Emote > EndEmote { get; set; } + public bool Move { get; set; } + public bool Camera { get; set; } + public bool EndOnRotate { get; set; } + public bool EndOnEmote { get; set; } + public byte ConditionMode { get; set; } + public bool Unknown7 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - StartEmote = new LazyRow< Emote >( lumina, parser.ReadColumn< ushort >( 0 ), language ); - EndEmote = new LazyRow< Emote >( lumina, parser.ReadColumn< ushort >( 1 ), language ); + StartEmote = new LazyRow< Emote >( gameData, parser.ReadColumn< ushort >( 0 ), language ); + EndEmote = new LazyRow< Emote >( gameData, parser.ReadColumn< ushort >( 1 ), language ); Move = parser.ReadColumn< bool >( 2 ); Camera = parser.ReadColumn< bool >( 3 ); EndOnRotate = parser.ReadColumn< bool >( 4 ); diff --git a/src/Lumina.Excel/GeneratedSheets/EquipRaceCategory.cs b/src/Lumina.Excel/GeneratedSheets/EquipRaceCategory.cs index b558625f..f95aae81 100644 --- a/src/Lumina.Excel/GeneratedSheets/EquipRaceCategory.cs +++ b/src/Lumina.Excel/GeneratedSheets/EquipRaceCategory.cs @@ -7,27 +7,23 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "EquipRaceCategory", columnHash: 0xf914b198 )] - public class EquipRaceCategory : IExcelRow + public class EquipRaceCategory : ExcelRow { - public bool Hyur; - public bool Elezen; - public bool Lalafell; - public bool Miqote; - public bool Roegadyn; - public bool AuRa; - public bool Unknown6; - public bool Unknown7; - public bool Male; - public bool Female; + public bool Hyur { get; set; } + public bool Elezen { get; set; } + public bool Lalafell { get; set; } + public bool Miqote { get; set; } + public bool Roegadyn { get; set; } + public bool AuRa { get; set; } + public bool Unknown6 { get; set; } + public bool Unknown7 { get; set; } + public bool Male { get; set; } + public bool Female { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Hyur = parser.ReadColumn< bool >( 0 ); Elezen = parser.ReadColumn< bool >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/EquipSlotCategory.cs b/src/Lumina.Excel/GeneratedSheets/EquipSlotCategory.cs index 869dcad8..c238ffc5 100644 --- a/src/Lumina.Excel/GeneratedSheets/EquipSlotCategory.cs +++ b/src/Lumina.Excel/GeneratedSheets/EquipSlotCategory.cs @@ -7,31 +7,27 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "EquipSlotCategory", columnHash: 0xf4ab6454 )] - public class EquipSlotCategory : IExcelRow + public class EquipSlotCategory : ExcelRow { - public sbyte MainHand; - public sbyte OffHand; - public sbyte Head; - public sbyte Body; - public sbyte Gloves; - public sbyte Waist; - public sbyte Legs; - public sbyte Feet; - public sbyte Ears; - public sbyte Neck; - public sbyte Wrists; - public sbyte FingerL; - public sbyte FingerR; - public sbyte SoulCrystal; + public sbyte MainHand { get; set; } + public sbyte OffHand { get; set; } + public sbyte Head { get; set; } + public sbyte Body { get; set; } + public sbyte Gloves { get; set; } + public sbyte Waist { get; set; } + public sbyte Legs { get; set; } + public sbyte Feet { get; set; } + public sbyte Ears { get; set; } + public sbyte Neck { get; set; } + public sbyte Wrists { get; set; } + public sbyte FingerL { get; set; } + public sbyte FingerR { get; set; } + public sbyte SoulCrystal { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); MainHand = parser.ReadColumn< sbyte >( 0 ); OffHand = parser.ReadColumn< sbyte >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/EurekaAetherItem.cs b/src/Lumina.Excel/GeneratedSheets/EurekaAetherItem.cs index 84c3d443..71e3826d 100644 --- a/src/Lumina.Excel/GeneratedSheets/EurekaAetherItem.cs +++ b/src/Lumina.Excel/GeneratedSheets/EurekaAetherItem.cs @@ -7,26 +7,22 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "EurekaAetherItem", columnHash: 0x45c06ae0 )] - public class EurekaAetherItem : IExcelRow + public class EurekaAetherItem : ExcelRow { - public SeString Singular; - public sbyte Adjective; - public SeString Plural; - public sbyte PossessivePronoun; - public sbyte StartsWithVowel; - public sbyte Unknown5; - public sbyte Pronoun; - public sbyte Article; - public SeString Name; + public SeString Singular { get; set; } + public sbyte Adjective { get; set; } + public SeString Plural { get; set; } + public sbyte PossessivePronoun { get; set; } + public sbyte StartsWithVowel { get; set; } + public sbyte Unknown5 { get; set; } + public sbyte Pronoun { get; set; } + public sbyte Article { get; set; } + public SeString Name { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Singular = parser.ReadColumn< SeString >( 0 ); Adjective = parser.ReadColumn< sbyte >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/EurekaAethernet.cs b/src/Lumina.Excel/GeneratedSheets/EurekaAethernet.cs index 3305db39..42e504a3 100644 --- a/src/Lumina.Excel/GeneratedSheets/EurekaAethernet.cs +++ b/src/Lumina.Excel/GeneratedSheets/EurekaAethernet.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "EurekaAethernet", columnHash: 0xd870e208 )] - public class EurekaAethernet : IExcelRow + public class EurekaAethernet : ExcelRow { - public LazyRow< PlaceName > Location; + public LazyRow< PlaceName > Location { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Location = new LazyRow< PlaceName >( lumina, parser.ReadColumn< ushort >( 0 ), language ); + Location = new LazyRow< PlaceName >( gameData, parser.ReadColumn< ushort >( 0 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/EurekaGrowData.cs b/src/Lumina.Excel/GeneratedSheets/EurekaGrowData.cs index f839e886..dc3c05fc 100644 --- a/src/Lumina.Excel/GeneratedSheets/EurekaGrowData.cs +++ b/src/Lumina.Excel/GeneratedSheets/EurekaGrowData.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "EurekaGrowData", columnHash: 0xd870e208 )] - public class EurekaGrowData : IExcelRow + public class EurekaGrowData : ExcelRow { - public ushort BaseResistance; + public ushort BaseResistance { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); BaseResistance = parser.ReadColumn< ushort >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/EurekaLogosMixerProbability.cs b/src/Lumina.Excel/GeneratedSheets/EurekaLogosMixerProbability.cs index 4d23a397..bad2c6dc 100644 --- a/src/Lumina.Excel/GeneratedSheets/EurekaLogosMixerProbability.cs +++ b/src/Lumina.Excel/GeneratedSheets/EurekaLogosMixerProbability.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "EurekaLogosMixerProbability", columnHash: 0xdcfd9eba )] - public class EurekaLogosMixerProbability : IExcelRow + public class EurekaLogosMixerProbability : ExcelRow { - public byte ProbabilityPct; + public byte ProbabilityPct { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); ProbabilityPct = parser.ReadColumn< byte >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/EurekaMagiaAction.cs b/src/Lumina.Excel/GeneratedSheets/EurekaMagiaAction.cs index b460f109..8aaf9b8c 100644 --- a/src/Lumina.Excel/GeneratedSheets/EurekaMagiaAction.cs +++ b/src/Lumina.Excel/GeneratedSheets/EurekaMagiaAction.cs @@ -7,21 +7,17 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "EurekaMagiaAction", columnHash: 0x5a516458 )] - public class EurekaMagiaAction : IExcelRow + public class EurekaMagiaAction : ExcelRow { - public LazyRow< Action > Action; - public byte MaxUses; + public LazyRow< Action > Action { get; set; } + public byte MaxUses { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Action = new LazyRow< Action >( lumina, parser.ReadColumn< uint >( 0 ), language ); + Action = new LazyRow< Action >( gameData, parser.ReadColumn< uint >( 0 ), language ); MaxUses = parser.ReadColumn< byte >( 1 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/EurekaMagiciteItem.cs b/src/Lumina.Excel/GeneratedSheets/EurekaMagiciteItem.cs index 37ac54fc..3ffa9313 100644 --- a/src/Lumina.Excel/GeneratedSheets/EurekaMagiciteItem.cs +++ b/src/Lumina.Excel/GeneratedSheets/EurekaMagiciteItem.cs @@ -7,24 +7,20 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "EurekaMagiciteItem", columnHash: 0xbc638df5 )] - public class EurekaMagiciteItem : IExcelRow + public class EurekaMagiciteItem : ExcelRow { - public LazyRow< EurekaMagiciteItemType > EurekaMagiciteItemType; - public LazyRow< ClassJobCategory > ClassJobCategory; - public LazyRow< Item > Item; + public LazyRow< EurekaMagiciteItemType > EurekaMagiciteItemType { get; set; } + public LazyRow< ClassJobCategory > ClassJobCategory { get; set; } + public LazyRow< Item > Item { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - EurekaMagiciteItemType = new LazyRow< EurekaMagiciteItemType >( lumina, parser.ReadColumn< byte >( 0 ), language ); - ClassJobCategory = new LazyRow< ClassJobCategory >( lumina, parser.ReadColumn< byte >( 1 ), language ); - Item = new LazyRow< Item >( lumina, parser.ReadColumn< uint >( 2 ), language ); + EurekaMagiciteItemType = new LazyRow< EurekaMagiciteItemType >( gameData, parser.ReadColumn< byte >( 0 ), language ); + ClassJobCategory = new LazyRow< ClassJobCategory >( gameData, parser.ReadColumn< byte >( 1 ), language ); + Item = new LazyRow< Item >( gameData, parser.ReadColumn< uint >( 2 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/EurekaMagiciteItemType.cs b/src/Lumina.Excel/GeneratedSheets/EurekaMagiciteItemType.cs index 9ddb1038..a043b9fc 100644 --- a/src/Lumina.Excel/GeneratedSheets/EurekaMagiciteItemType.cs +++ b/src/Lumina.Excel/GeneratedSheets/EurekaMagiciteItemType.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "EurekaMagiciteItemType", columnHash: 0xdebb20e3 )] - public class EurekaMagiciteItemType : IExcelRow + public class EurekaMagiciteItemType : ExcelRow { - public SeString Type; + public SeString Type { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Type = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/EurekaSphereElementAdjust.cs b/src/Lumina.Excel/GeneratedSheets/EurekaSphereElementAdjust.cs index eb1a6922..526217c1 100644 --- a/src/Lumina.Excel/GeneratedSheets/EurekaSphereElementAdjust.cs +++ b/src/Lumina.Excel/GeneratedSheets/EurekaSphereElementAdjust.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "EurekaSphereElementAdjust", columnHash: 0xd870e208 )] - public class EurekaSphereElementAdjust : IExcelRow + public class EurekaSphereElementAdjust : ExcelRow { - public ushort PowerModifier; + public ushort PowerModifier { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); PowerModifier = parser.ReadColumn< ushort >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/EventAction.cs b/src/Lumina.Excel/GeneratedSheets/EventAction.cs index f6d0d532..f9a559c2 100644 --- a/src/Lumina.Excel/GeneratedSheets/EventAction.cs +++ b/src/Lumina.Excel/GeneratedSheets/EventAction.cs @@ -7,28 +7,24 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "EventAction", columnHash: 0x1c60d673 )] - public class EventAction : IExcelRow + public class EventAction : ExcelRow { - public SeString Name; - public ushort Icon; - public byte CastTime; - public LazyRow< ActionTimeline >[] Animation; + public SeString Name { get; set; } + public ushort Icon { get; set; } + public byte CastTime { get; set; } + public LazyRow< ActionTimeline >[] Animation { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); Icon = parser.ReadColumn< ushort >( 1 ); CastTime = parser.ReadColumn< byte >( 2 ); Animation = new LazyRow< ActionTimeline >[ 3 ]; for( var i = 0; i < 3; i++ ) - Animation[ i ] = new LazyRow< ActionTimeline >( lumina, parser.ReadColumn< ushort >( 3 + i ), language ); + Animation[ i ] = new LazyRow< ActionTimeline >( gameData, parser.ReadColumn< ushort >( 3 + i ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/EventIconPriority.cs b/src/Lumina.Excel/GeneratedSheets/EventIconPriority.cs index f315a48f..cd10f330 100644 --- a/src/Lumina.Excel/GeneratedSheets/EventIconPriority.cs +++ b/src/Lumina.Excel/GeneratedSheets/EventIconPriority.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "EventIconPriority", columnHash: 0xf16871d0 )] - public class EventIconPriority : IExcelRow + public class EventIconPriority : ExcelRow { - public uint[] Icon; + public uint[] Icon { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Icon = new uint[ 19 ]; for( var i = 0; i < 19; i++ ) diff --git a/src/Lumina.Excel/GeneratedSheets/EventIconType.cs b/src/Lumina.Excel/GeneratedSheets/EventIconType.cs index 808d98dd..a23fa1bc 100644 --- a/src/Lumina.Excel/GeneratedSheets/EventIconType.cs +++ b/src/Lumina.Excel/GeneratedSheets/EventIconType.cs @@ -7,22 +7,18 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "EventIconType", columnHash: 0x6ce9409c )] - public class EventIconType : IExcelRow + public class EventIconType : ExcelRow { - public uint NpcIconAvailable; - public uint MapIconAvailable; - public uint NpcIconInvalid; - public uint MapIconInvalid; - public byte IconRange; + public uint NpcIconAvailable { get; set; } + public uint MapIconAvailable { get; set; } + public uint NpcIconInvalid { get; set; } + public uint MapIconInvalid { get; set; } + public byte IconRange { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); NpcIconAvailable = parser.ReadColumn< uint >( 0 ); MapIconAvailable = parser.ReadColumn< uint >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/EventItem.cs b/src/Lumina.Excel/GeneratedSheets/EventItem.cs index 67ee031d..49d24995 100644 --- a/src/Lumina.Excel/GeneratedSheets/EventItem.cs +++ b/src/Lumina.Excel/GeneratedSheets/EventItem.cs @@ -7,35 +7,31 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "EventItem", columnHash: 0x2a1d4fb2 )] - public class EventItem : IExcelRow + public class EventItem : ExcelRow { - public SeString Singular; - public sbyte Adjective; - public SeString Plural; - public sbyte PossessivePronoun; - public sbyte StartsWithVowel; - public sbyte Unknown5; - public sbyte Pronoun; - public sbyte Article; - public bool Unknown8; - public SeString Name; - public ushort Icon; - public LazyRow< Action > Action; - public byte StackSize; - public byte Unknown13; - public LazyRow< Quest > Quest; - public byte CastTime; - public LazyRow< EventItemCastTimeline > CastTimeline; - public byte Timeline; + public SeString Singular { get; set; } + public sbyte Adjective { get; set; } + public SeString Plural { get; set; } + public sbyte PossessivePronoun { get; set; } + public sbyte StartsWithVowel { get; set; } + public sbyte Unknown5 { get; set; } + public sbyte Pronoun { get; set; } + public sbyte Article { get; set; } + public bool Unknown8 { get; set; } + public SeString Name { get; set; } + public ushort Icon { get; set; } + public LazyRow< Action > Action { get; set; } + public byte StackSize { get; set; } + public byte Unknown13 { get; set; } + public LazyRow< Quest > Quest { get; set; } + public byte CastTime { get; set; } + public LazyRow< EventItemCastTimeline > CastTimeline { get; set; } + public byte Timeline { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Singular = parser.ReadColumn< SeString >( 0 ); Adjective = parser.ReadColumn< sbyte >( 1 ); @@ -48,12 +44,12 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) Unknown8 = parser.ReadColumn< bool >( 8 ); Name = parser.ReadColumn< SeString >( 9 ); Icon = parser.ReadColumn< ushort >( 10 ); - Action = new LazyRow< Action >( lumina, parser.ReadColumn< ushort >( 11 ), language ); + Action = new LazyRow< Action >( gameData, parser.ReadColumn< ushort >( 11 ), language ); StackSize = parser.ReadColumn< byte >( 12 ); Unknown13 = parser.ReadColumn< byte >( 13 ); - Quest = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 14 ), language ); + Quest = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 14 ), language ); CastTime = parser.ReadColumn< byte >( 15 ); - CastTimeline = new LazyRow< EventItemCastTimeline >( lumina, parser.ReadColumn< byte >( 16 ), language ); + CastTimeline = new LazyRow< EventItemCastTimeline >( gameData, parser.ReadColumn< byte >( 16 ), language ); Timeline = parser.ReadColumn< byte >( 17 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/EventItemCastTimeline.cs b/src/Lumina.Excel/GeneratedSheets/EventItemCastTimeline.cs index 9332ab1a..036f9cab 100644 --- a/src/Lumina.Excel/GeneratedSheets/EventItemCastTimeline.cs +++ b/src/Lumina.Excel/GeneratedSheets/EventItemCastTimeline.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "EventItemCastTimeline", columnHash: 0xdbf43666 )] - public class EventItemCastTimeline : IExcelRow + public class EventItemCastTimeline : ExcelRow { - public LazyRow< ActionTimeline > ActionTimeline; + public LazyRow< ActionTimeline > ActionTimeline { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - ActionTimeline = new LazyRow< ActionTimeline >( lumina, parser.ReadColumn< uint >( 0 ), language ); + ActionTimeline = new LazyRow< ActionTimeline >( gameData, parser.ReadColumn< uint >( 0 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/EventItemHelp.cs b/src/Lumina.Excel/GeneratedSheets/EventItemHelp.cs index 41fda24e..0c674c53 100644 --- a/src/Lumina.Excel/GeneratedSheets/EventItemHelp.cs +++ b/src/Lumina.Excel/GeneratedSheets/EventItemHelp.cs @@ -7,19 +7,15 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "EventItemHelp", columnHash: 0x8e477c70 )] - public class EventItemHelp : IExcelRow + public class EventItemHelp : ExcelRow { - public SeString Description; - public bool Unknown1; + public SeString Description { get; set; } + public bool Unknown1 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Description = parser.ReadColumn< SeString >( 0 ); Unknown1 = parser.ReadColumn< bool >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/EventItemTimeline.cs b/src/Lumina.Excel/GeneratedSheets/EventItemTimeline.cs index fd469410..916aa305 100644 --- a/src/Lumina.Excel/GeneratedSheets/EventItemTimeline.cs +++ b/src/Lumina.Excel/GeneratedSheets/EventItemTimeline.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "EventItemTimeline", columnHash: 0xdbf43666 )] - public class EventItemTimeline : IExcelRow + public class EventItemTimeline : ExcelRow { - public LazyRow< ActionTimeline > ActionTimeline; + public LazyRow< ActionTimeline > ActionTimeline { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - ActionTimeline = new LazyRow< ActionTimeline >( lumina, parser.ReadColumn< uint >( 0 ), language ); + ActionTimeline = new LazyRow< ActionTimeline >( gameData, parser.ReadColumn< uint >( 0 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/EventSystemDefine.cs b/src/Lumina.Excel/GeneratedSheets/EventSystemDefine.cs index bc8c37bc..d7060280 100644 --- a/src/Lumina.Excel/GeneratedSheets/EventSystemDefine.cs +++ b/src/Lumina.Excel/GeneratedSheets/EventSystemDefine.cs @@ -7,19 +7,15 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "EventSystemDefine", columnHash: 0x98fff20a )] - public class EventSystemDefine : IExcelRow + public class EventSystemDefine : ExcelRow { - public SeString Text; - public uint DefineValue; + public SeString Text { get; set; } + public uint DefineValue { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Text = parser.ReadColumn< SeString >( 0 ); DefineValue = parser.ReadColumn< uint >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/ExVersion.cs b/src/Lumina.Excel/GeneratedSheets/ExVersion.cs index d1fa46ec..8cff240a 100644 --- a/src/Lumina.Excel/GeneratedSheets/ExVersion.cs +++ b/src/Lumina.Excel/GeneratedSheets/ExVersion.cs @@ -7,24 +7,20 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ExVersion", columnHash: 0xcc3ad729 )] - public class ExVersion : IExcelRow + public class ExVersion : ExcelRow { - public SeString Name; - public LazyRow< ScreenImage > AcceptJingle; - public LazyRow< ScreenImage > CompleteJingle; + public SeString Name { get; set; } + public LazyRow< ScreenImage > AcceptJingle { get; set; } + public LazyRow< ScreenImage > CompleteJingle { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); - AcceptJingle = new LazyRow< ScreenImage >( lumina, parser.ReadColumn< ushort >( 1 ), language ); - CompleteJingle = new LazyRow< ScreenImage >( lumina, parser.ReadColumn< ushort >( 2 ), language ); + AcceptJingle = new LazyRow< ScreenImage >( gameData, parser.ReadColumn< ushort >( 1 ), language ); + CompleteJingle = new LazyRow< ScreenImage >( gameData, parser.ReadColumn< ushort >( 2 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/ExportedSG.cs b/src/Lumina.Excel/GeneratedSheets/ExportedSG.cs index e63fcb9d..c02c546d 100644 --- a/src/Lumina.Excel/GeneratedSheets/ExportedSG.cs +++ b/src/Lumina.Excel/GeneratedSheets/ExportedSG.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ExportedSG", columnHash: 0xdebb20e3 )] - public class ExportedSG : IExcelRow + public class ExportedSG : ExcelRow { - public SeString SgbPath; + public SeString SgbPath { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); SgbPath = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/FCActivity.cs b/src/Lumina.Excel/GeneratedSheets/FCActivity.cs index ef70fc77..1380bc14 100644 --- a/src/Lumina.Excel/GeneratedSheets/FCActivity.cs +++ b/src/Lumina.Excel/GeneratedSheets/FCActivity.cs @@ -7,29 +7,25 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "FCActivity", columnHash: 0xe45dc889 )] - public class FCActivity : IExcelRow + public class FCActivity : ExcelRow { - public SeString Text; - public byte SelfKind; - public byte TargetKind; - public byte NumParam; - public LazyRow< FCActivityCategory > FCActivityCategory; - public sbyte IconType; + public SeString Text { get; set; } + public byte SelfKind { get; set; } + public byte TargetKind { get; set; } + public byte NumParam { get; set; } + public LazyRow< FCActivityCategory > FCActivityCategory { get; set; } + public sbyte IconType { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Text = parser.ReadColumn< SeString >( 0 ); SelfKind = parser.ReadColumn< byte >( 1 ); TargetKind = parser.ReadColumn< byte >( 2 ); NumParam = parser.ReadColumn< byte >( 3 ); - FCActivityCategory = new LazyRow< FCActivityCategory >( lumina, parser.ReadColumn< byte >( 4 ), language ); + FCActivityCategory = new LazyRow< FCActivityCategory >( gameData, parser.ReadColumn< byte >( 4 ), language ); IconType = parser.ReadColumn< sbyte >( 5 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/FCActivityCategory.cs b/src/Lumina.Excel/GeneratedSheets/FCActivityCategory.cs index 0f9ede6e..77472961 100644 --- a/src/Lumina.Excel/GeneratedSheets/FCActivityCategory.cs +++ b/src/Lumina.Excel/GeneratedSheets/FCActivityCategory.cs @@ -7,19 +7,15 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "FCActivityCategory", columnHash: 0x5eb59ccb )] - public class FCActivityCategory : IExcelRow + public class FCActivityCategory : ExcelRow { - public byte Priority; - public SeString Name; + public byte Priority { get; set; } + public SeString Name { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Priority = parser.ReadColumn< byte >( 0 ); Name = parser.ReadColumn< SeString >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/FCAuthority.cs b/src/Lumina.Excel/GeneratedSheets/FCAuthority.cs index 9d67a44d..45e9534c 100644 --- a/src/Lumina.Excel/GeneratedSheets/FCAuthority.cs +++ b/src/Lumina.Excel/GeneratedSheets/FCAuthority.cs @@ -7,23 +7,19 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "FCAuthority", columnHash: 0x1ee79c01 )] - public class FCAuthority : IExcelRow + public class FCAuthority : ExcelRow { - public SeString Name; - public LazyRow< FCAuthorityCategory > FCAuthorityCategory; - public byte Unknown2; + public SeString Name { get; set; } + public LazyRow< FCAuthorityCategory > FCAuthorityCategory { get; set; } + public byte Unknown2 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); - FCAuthorityCategory = new LazyRow< FCAuthorityCategory >( lumina, parser.ReadColumn< int >( 1 ), language ); + FCAuthorityCategory = new LazyRow< FCAuthorityCategory >( gameData, parser.ReadColumn< int >( 1 ), language ); Unknown2 = parser.ReadColumn< byte >( 2 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/FCAuthorityCategory.cs b/src/Lumina.Excel/GeneratedSheets/FCAuthorityCategory.cs index a377264f..157d6863 100644 --- a/src/Lumina.Excel/GeneratedSheets/FCAuthorityCategory.cs +++ b/src/Lumina.Excel/GeneratedSheets/FCAuthorityCategory.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "FCAuthorityCategory", columnHash: 0xdebb20e3 )] - public class FCAuthorityCategory : IExcelRow + public class FCAuthorityCategory : ExcelRow { - public SeString Name; + public SeString Name { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/FCChestName.cs b/src/Lumina.Excel/GeneratedSheets/FCChestName.cs index 726530f1..45f3ea64 100644 --- a/src/Lumina.Excel/GeneratedSheets/FCChestName.cs +++ b/src/Lumina.Excel/GeneratedSheets/FCChestName.cs @@ -7,19 +7,15 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "FCChestName", columnHash: 0x9ff65ad6 )] - public class FCChestName : IExcelRow + public class FCChestName : ExcelRow { - public SeString Name; - public byte Unknown1; + public SeString Name { get; set; } + public byte Unknown1 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); Unknown1 = parser.ReadColumn< byte >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/FCCrestSymbol.cs b/src/Lumina.Excel/GeneratedSheets/FCCrestSymbol.cs index 774422bf..2561374c 100644 --- a/src/Lumina.Excel/GeneratedSheets/FCCrestSymbol.cs +++ b/src/Lumina.Excel/GeneratedSheets/FCCrestSymbol.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "FCCrestSymbol", columnHash: 0x43bdd5b1 )] - public class FCCrestSymbol : IExcelRow + public class FCCrestSymbol : ExcelRow { - public byte ColorNum; - public byte FCRight; - public ushort Unknown2; + public byte ColorNum { get; set; } + public byte FCRight { get; set; } + public ushort Unknown2 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); ColorNum = parser.ReadColumn< byte >( 0 ); FCRight = parser.ReadColumn< byte >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/FCHierarchy.cs b/src/Lumina.Excel/GeneratedSheets/FCHierarchy.cs index aadec29e..c054d681 100644 --- a/src/Lumina.Excel/GeneratedSheets/FCHierarchy.cs +++ b/src/Lumina.Excel/GeneratedSheets/FCHierarchy.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "FCHierarchy", columnHash: 0xdebb20e3 )] - public class FCHierarchy : IExcelRow + public class FCHierarchy : ExcelRow { - public SeString Name; + public SeString Name { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/FCProfile.cs b/src/Lumina.Excel/GeneratedSheets/FCProfile.cs index 9d986855..eac71318 100644 --- a/src/Lumina.Excel/GeneratedSheets/FCProfile.cs +++ b/src/Lumina.Excel/GeneratedSheets/FCProfile.cs @@ -7,19 +7,15 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "FCProfile", columnHash: 0x5eb59ccb )] - public class FCProfile : IExcelRow + public class FCProfile : ExcelRow { - public byte Priority; - public SeString Name; + public byte Priority { get; set; } + public SeString Name { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Priority = parser.ReadColumn< byte >( 0 ); Name = parser.ReadColumn< SeString >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/FCRank.cs b/src/Lumina.Excel/GeneratedSheets/FCRank.cs index e0e9adcb..23742613 100644 --- a/src/Lumina.Excel/GeneratedSheets/FCRank.cs +++ b/src/Lumina.Excel/GeneratedSheets/FCRank.cs @@ -7,25 +7,21 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "FCRank", columnHash: 0x0105b558 )] - public class FCRank : IExcelRow + public class FCRank : ExcelRow { - public uint NextPoint; - public uint CurrentPoint; - public ushort Rights; - public ushort Unknown3; - public ushort Unknown4; - public byte FCActionActiveNum; - public byte FCActionStockNum; - public byte Unknown7; + public uint NextPoint { get; set; } + public uint CurrentPoint { get; set; } + public ushort Rights { get; set; } + public ushort Unknown3 { get; set; } + public ushort Unknown4 { get; set; } + public byte FCActionActiveNum { get; set; } + public byte FCActionStockNum { get; set; } + public byte Unknown7 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); NextPoint = parser.ReadColumn< uint >( 0 ); CurrentPoint = parser.ReadColumn< uint >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/FCReputation.cs b/src/Lumina.Excel/GeneratedSheets/FCReputation.cs index a7697978..b81b8305 100644 --- a/src/Lumina.Excel/GeneratedSheets/FCReputation.cs +++ b/src/Lumina.Excel/GeneratedSheets/FCReputation.cs @@ -7,27 +7,23 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "FCReputation", columnHash: 0x3d6be37e )] - public class FCReputation : IExcelRow + public class FCReputation : ExcelRow { - public uint PointsToNext; - public uint RequiredPoints; - public byte DiscountRate; - public LazyRow< UIColor > Color; - public SeString Name; + public uint PointsToNext { get; set; } + public uint RequiredPoints { get; set; } + public byte DiscountRate { get; set; } + public LazyRow< UIColor > Color { get; set; } + public SeString Name { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); PointsToNext = parser.ReadColumn< uint >( 0 ); RequiredPoints = parser.ReadColumn< uint >( 1 ); DiscountRate = parser.ReadColumn< byte >( 2 ); - Color = new LazyRow< UIColor >( lumina, parser.ReadColumn< uint >( 3 ), language ); + Color = new LazyRow< UIColor >( gameData, parser.ReadColumn< uint >( 3 ), language ); Name = parser.ReadColumn< SeString >( 4 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/FCRights.cs b/src/Lumina.Excel/GeneratedSheets/FCRights.cs index 5fb4d530..33ebb9fd 100644 --- a/src/Lumina.Excel/GeneratedSheets/FCRights.cs +++ b/src/Lumina.Excel/GeneratedSheets/FCRights.cs @@ -7,26 +7,22 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "FCRights", columnHash: 0xce73d687 )] - public class FCRights : IExcelRow + public class FCRights : ExcelRow { - public SeString Name; - public SeString Description; - public ushort Icon; - public LazyRow< FCRank > FCRank; + public SeString Name { get; set; } + public SeString Description { get; set; } + public ushort Icon { get; set; } + public LazyRow< FCRank > FCRank { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); Description = parser.ReadColumn< SeString >( 1 ); Icon = parser.ReadColumn< ushort >( 2 ); - FCRank = new LazyRow< FCRank >( lumina, parser.ReadColumn< byte >( 3 ), language ); + FCRank = new LazyRow< FCRank >( gameData, parser.ReadColumn< byte >( 3 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/Fate.cs b/src/Lumina.Excel/GeneratedSheets/Fate.cs index 975509c8..732412b1 100644 --- a/src/Lumina.Excel/GeneratedSheets/Fate.cs +++ b/src/Lumina.Excel/GeneratedSheets/Fate.cs @@ -7,54 +7,50 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Fate", columnHash: 0x7448945f )] - public class Fate : IExcelRow + public class Fate : ExcelRow { - public byte EurekaFate; - public byte Rule; - public ushort FateRuleEx; - public uint Location; - public byte ClassJobLevel; - public byte ClassJobLevelMax; - public LazyRow< EventItem > EventItem; - public byte[] TypeToDoValue; - public uint IconObjective; - public uint IconMap; - public uint IconInactiveMap; - public LazyRow< BGM > Music; - public uint LGBGuardNPCLocation; - public LazyRow< ScreenImage > ScreenImageAccept; - public LazyRow< ScreenImage > ScreenImageComplete; - public LazyRow< ScreenImage > ScreenImageFailed; - public byte Unknown18; - public uint Unknown19; - public bool SpecialFate; - public bool Unknown21; - public LazyRow< Status > GivenStatus; - public ushort Unknown23; - public bool AdventEvent; - public bool MoonFaireEvent; - public bool Unknown26; - public uint FATEChain; - public byte Unknown28; - public ushort Unknown29; - public SeString Name; - public SeString Description; - public SeString Objective; - public SeString[] StatusText; - public LazyRow< ArrayEventHandler > ArrayIndex; - public uint Unknown37; - public LazyRow< EventItem > ReqEventItem; - public LazyRow< EventItem > TurnInEventItem; - public ushort[] ObjectiveIcon; + public byte EurekaFate { get; set; } + public byte Rule { get; set; } + public ushort FateRuleEx { get; set; } + public uint Location { get; set; } + public byte ClassJobLevel { get; set; } + public byte ClassJobLevelMax { get; set; } + public LazyRow< EventItem > EventItem { get; set; } + public byte[] TypeToDoValue { get; set; } + public uint IconObjective { get; set; } + public uint IconMap { get; set; } + public uint IconInactiveMap { get; set; } + public LazyRow< BGM > Music { get; set; } + public uint LGBGuardNPCLocation { get; set; } + public LazyRow< ScreenImage > ScreenImageAccept { get; set; } + public LazyRow< ScreenImage > ScreenImageComplete { get; set; } + public LazyRow< ScreenImage > ScreenImageFailed { get; set; } + public byte Unknown18 { get; set; } + public uint Unknown19 { get; set; } + public bool SpecialFate { get; set; } + public bool Unknown21 { get; set; } + public LazyRow< Status > GivenStatus { get; set; } + public ushort Unknown23 { get; set; } + public bool AdventEvent { get; set; } + public bool MoonFaireEvent { get; set; } + public bool Unknown26 { get; set; } + public uint FATEChain { get; set; } + public byte Unknown28 { get; set; } + public ushort Unknown29 { get; set; } + public SeString Name { get; set; } + public SeString Description { get; set; } + public SeString Objective { get; set; } + public SeString[] StatusText { get; set; } + public LazyRow< ArrayEventHandler > ArrayIndex { get; set; } + public uint Unknown37 { get; set; } + public LazyRow< EventItem > ReqEventItem { get; set; } + public LazyRow< EventItem > TurnInEventItem { get; set; } + public ushort[] ObjectiveIcon { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); EurekaFate = parser.ReadColumn< byte >( 0 ); Rule = parser.ReadColumn< byte >( 1 ); @@ -62,23 +58,23 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) Location = parser.ReadColumn< uint >( 3 ); ClassJobLevel = parser.ReadColumn< byte >( 4 ); ClassJobLevelMax = parser.ReadColumn< byte >( 5 ); - EventItem = new LazyRow< EventItem >( lumina, parser.ReadColumn< uint >( 6 ), language ); + EventItem = new LazyRow< EventItem >( gameData, parser.ReadColumn< uint >( 6 ), language ); TypeToDoValue = new byte[ 3 ]; for( var i = 0; i < 3; i++ ) TypeToDoValue[ i ] = parser.ReadColumn< byte >( 7 + i ); IconObjective = parser.ReadColumn< uint >( 10 ); IconMap = parser.ReadColumn< uint >( 11 ); IconInactiveMap = parser.ReadColumn< uint >( 12 ); - Music = new LazyRow< BGM >( lumina, parser.ReadColumn< int >( 13 ), language ); + Music = new LazyRow< BGM >( gameData, parser.ReadColumn< int >( 13 ), language ); LGBGuardNPCLocation = parser.ReadColumn< uint >( 14 ); - ScreenImageAccept = new LazyRow< ScreenImage >( lumina, parser.ReadColumn< ushort >( 15 ), language ); - ScreenImageComplete = new LazyRow< ScreenImage >( lumina, parser.ReadColumn< ushort >( 16 ), language ); - ScreenImageFailed = new LazyRow< ScreenImage >( lumina, parser.ReadColumn< ushort >( 17 ), language ); + ScreenImageAccept = new LazyRow< ScreenImage >( gameData, parser.ReadColumn< ushort >( 15 ), language ); + ScreenImageComplete = new LazyRow< ScreenImage >( gameData, parser.ReadColumn< ushort >( 16 ), language ); + ScreenImageFailed = new LazyRow< ScreenImage >( gameData, parser.ReadColumn< ushort >( 17 ), language ); Unknown18 = parser.ReadColumn< byte >( 18 ); Unknown19 = parser.ReadColumn< uint >( 19 ); SpecialFate = parser.ReadColumn< bool >( 20 ); Unknown21 = parser.ReadColumn< bool >( 21 ); - GivenStatus = new LazyRow< Status >( lumina, parser.ReadColumn< ushort >( 22 ), language ); + GivenStatus = new LazyRow< Status >( gameData, parser.ReadColumn< ushort >( 22 ), language ); Unknown23 = parser.ReadColumn< ushort >( 23 ); AdventEvent = parser.ReadColumn< bool >( 24 ); MoonFaireEvent = parser.ReadColumn< bool >( 25 ); @@ -92,10 +88,10 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) StatusText = new SeString[ 3 ]; for( var i = 0; i < 3; i++ ) StatusText[ i ] = parser.ReadColumn< SeString >( 33 + i ); - ArrayIndex = new LazyRow< ArrayEventHandler >( lumina, parser.ReadColumn< uint >( 36 ), language ); + ArrayIndex = new LazyRow< ArrayEventHandler >( gameData, parser.ReadColumn< uint >( 36 ), language ); Unknown37 = parser.ReadColumn< uint >( 37 ); - ReqEventItem = new LazyRow< EventItem >( lumina, parser.ReadColumn< uint >( 38 ), language ); - TurnInEventItem = new LazyRow< EventItem >( lumina, parser.ReadColumn< uint >( 39 ), language ); + ReqEventItem = new LazyRow< EventItem >( gameData, parser.ReadColumn< uint >( 38 ), language ); + TurnInEventItem = new LazyRow< EventItem >( gameData, parser.ReadColumn< uint >( 39 ), language ); ObjectiveIcon = new ushort[ 8 ]; for( var i = 0; i < 8; i++ ) ObjectiveIcon[ i ] = parser.ReadColumn< ushort >( 40 + i ); diff --git a/src/Lumina.Excel/GeneratedSheets/FateEvent.cs b/src/Lumina.Excel/GeneratedSheets/FateEvent.cs index 5d60be4f..931873b0 100644 --- a/src/Lumina.Excel/GeneratedSheets/FateEvent.cs +++ b/src/Lumina.Excel/GeneratedSheets/FateEvent.cs @@ -7,25 +7,21 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "FateEvent", columnHash: 0x0f779649 )] - public class FateEvent : IExcelRow + public class FateEvent : ExcelRow { - public byte[] Turn; - public uint[] Gesture; - public int[] LipSync; - public int[] Facial; - public int[] Shape; - public bool[] IsAutoShake; - public byte[] WidgetType; - public SeString[] Text; + public byte[] Turn { get; set; } + public uint[] Gesture { get; set; } + public int[] LipSync { get; set; } + public int[] Facial { get; set; } + public int[] Shape { get; set; } + public bool[] IsAutoShake { get; set; } + public byte[] WidgetType { get; set; } + public SeString[] Text { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Turn = new byte[ 8 ]; for( var i = 0; i < 8; i++ ) diff --git a/src/Lumina.Excel/GeneratedSheets/FateMode.cs b/src/Lumina.Excel/GeneratedSheets/FateMode.cs index d62f6d93..8f0cbb3a 100644 --- a/src/Lumina.Excel/GeneratedSheets/FateMode.cs +++ b/src/Lumina.Excel/GeneratedSheets/FateMode.cs @@ -7,22 +7,18 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "FateMode", columnHash: 0x6be0e840 )] - public class FateMode : IExcelRow + public class FateMode : ExcelRow { - public uint Unknown0; - public uint MotivationIcon; - public uint MotivationMapMarker; - public uint ObjectiveIcon; - public uint ObjectiveMapMarker; + public uint Unknown0 { get; set; } + public uint MotivationIcon { get; set; } + public uint MotivationMapMarker { get; set; } + public uint ObjectiveIcon { get; set; } + public uint ObjectiveMapMarker { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< uint >( 0 ); MotivationIcon = parser.ReadColumn< uint >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/FateProgressUI.cs b/src/Lumina.Excel/GeneratedSheets/FateProgressUI.cs index f6901bf2..caca43a3 100644 --- a/src/Lumina.Excel/GeneratedSheets/FateProgressUI.cs +++ b/src/Lumina.Excel/GeneratedSheets/FateProgressUI.cs @@ -7,25 +7,21 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "FateProgressUI", columnHash: 0x73e43ab7 )] - public class FateProgressUI : IExcelRow + public class FateProgressUI : ExcelRow { - public LazyRow< TerritoryType > Location; - public LazyRow< Achievement > Achievement; - public byte ReqFatesToRank2; - public byte ReqFatesToRank3; - public byte DisplayOrder; + public LazyRow< TerritoryType > Location { get; set; } + public LazyRow< Achievement > Achievement { get; set; } + public byte ReqFatesToRank2 { get; set; } + public byte ReqFatesToRank3 { get; set; } + public byte DisplayOrder { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Location = new LazyRow< TerritoryType >( lumina, parser.ReadColumn< int >( 0 ), language ); - Achievement = new LazyRow< Achievement >( lumina, parser.ReadColumn< int >( 1 ), language ); + Location = new LazyRow< TerritoryType >( gameData, parser.ReadColumn< int >( 0 ), language ); + Achievement = new LazyRow< Achievement >( gameData, parser.ReadColumn< int >( 1 ), language ); ReqFatesToRank2 = parser.ReadColumn< byte >( 2 ); ReqFatesToRank3 = parser.ReadColumn< byte >( 3 ); DisplayOrder = parser.ReadColumn< byte >( 4 ); diff --git a/src/Lumina.Excel/GeneratedSheets/FateTokenType.cs b/src/Lumina.Excel/GeneratedSheets/FateTokenType.cs index b4996b9d..ba250b97 100644 --- a/src/Lumina.Excel/GeneratedSheets/FateTokenType.cs +++ b/src/Lumina.Excel/GeneratedSheets/FateTokenType.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "FateTokenType", columnHash: 0xdbf43666 )] - public class FateTokenType : IExcelRow + public class FateTokenType : ExcelRow { - public LazyRow< Item > Currency; + public LazyRow< Item > Currency { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Currency = new LazyRow< Item >( lumina, parser.ReadColumn< uint >( 0 ), language ); + Currency = new LazyRow< Item >( gameData, parser.ReadColumn< uint >( 0 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/FccShop.cs b/src/Lumina.Excel/GeneratedSheets/FccShop.cs index aadba9a2..75f20a9c 100644 --- a/src/Lumina.Excel/GeneratedSheets/FccShop.cs +++ b/src/Lumina.Excel/GeneratedSheets/FccShop.cs @@ -7,7 +7,7 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "FccShop", columnHash: 0xccd13846 )] - public class FccShop : IExcelRow + public class FccShop : ExcelRow { public struct UnkStruct1Struct { @@ -22,18 +22,14 @@ public struct UnkStruct21Struct public byte FCRankRequired; } - public SeString Name; - public UnkStruct1Struct[] UnkStruct1; - public UnkStruct11Struct[] UnkStruct11; - public UnkStruct21Struct[] UnkStruct21; + public SeString Name { get; set; } + public UnkStruct1Struct[] UnkStruct1 { get; set; } + public UnkStruct11Struct[] UnkStruct11 { get; set; } + public UnkStruct21Struct[] UnkStruct21 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); UnkStruct1 = new UnkStruct1Struct[ 10 ]; diff --git a/src/Lumina.Excel/GeneratedSheets/Festival.cs b/src/Lumina.Excel/GeneratedSheets/Festival.cs index b25cb729..f93309a4 100644 --- a/src/Lumina.Excel/GeneratedSheets/Festival.cs +++ b/src/Lumina.Excel/GeneratedSheets/Festival.cs @@ -7,19 +7,15 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Festival", columnHash: 0x9ff65ad6 )] - public class Festival : IExcelRow + public class Festival : ExcelRow { - public SeString Name; - public byte Unknown1; + public SeString Name { get; set; } + public byte Unknown1 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); Unknown1 = parser.ReadColumn< byte >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/FieldMarker.cs b/src/Lumina.Excel/GeneratedSheets/FieldMarker.cs index aee2b344..9af3a9cc 100644 --- a/src/Lumina.Excel/GeneratedSheets/FieldMarker.cs +++ b/src/Lumina.Excel/GeneratedSheets/FieldMarker.cs @@ -7,23 +7,19 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "FieldMarker", columnHash: 0x23003392 )] - public class FieldMarker : IExcelRow + public class FieldMarker : ExcelRow { - public LazyRow< VFX > VFX; - public ushort Icon; - public ushort Unknown2; - public SeString Unknown3; + public LazyRow< VFX > VFX { get; set; } + public ushort Icon { get; set; } + public ushort Unknown2 { get; set; } + public SeString Unknown3 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - VFX = new LazyRow< VFX >( lumina, parser.ReadColumn< int >( 0 ), language ); + VFX = new LazyRow< VFX >( gameData, parser.ReadColumn< int >( 0 ), language ); Icon = parser.ReadColumn< ushort >( 1 ); Unknown2 = parser.ReadColumn< ushort >( 2 ); Unknown3 = parser.ReadColumn< SeString >( 3 ); diff --git a/src/Lumina.Excel/GeneratedSheets/FishParameter.cs b/src/Lumina.Excel/GeneratedSheets/FishParameter.cs index 156ef8f8..b80f4bd1 100644 --- a/src/Lumina.Excel/GeneratedSheets/FishParameter.cs +++ b/src/Lumina.Excel/GeneratedSheets/FishParameter.cs @@ -7,39 +7,35 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "FishParameter", columnHash: 0x019385c9 )] - public class FishParameter : IExcelRow + public class FishParameter : ExcelRow { - public SeString Text; - public int Item; - public LazyRow< GatheringItemLevelConvertTable > GatheringItemLevel; - public byte Unknown3; - public bool IsHidden; - public bool Unknown5; - public LazyRow< FishingRecordType > FishingRecordType; - public LazyRow< TerritoryType > TerritoryType; - public LazyRow< GatheringSubCategory > GatheringSubCategory; - public bool IsInLog; - public bool TimeRestricted; - public bool WeatherRestricted; + public SeString Text { get; set; } + public int Item { get; set; } + public LazyRow< GatheringItemLevelConvertTable > GatheringItemLevel { get; set; } + public byte Unknown3 { get; set; } + public bool IsHidden { get; set; } + public bool Unknown5 { get; set; } + public LazyRow< FishingRecordType > FishingRecordType { get; set; } + public LazyRow< TerritoryType > TerritoryType { get; set; } + public LazyRow< GatheringSubCategory > GatheringSubCategory { get; set; } + public bool IsInLog { get; set; } + public bool TimeRestricted { get; set; } + public bool WeatherRestricted { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Text = parser.ReadColumn< SeString >( 0 ); Item = parser.ReadColumn< int >( 1 ); - GatheringItemLevel = new LazyRow< GatheringItemLevelConvertTable >( lumina, parser.ReadColumn< ushort >( 2 ), language ); + GatheringItemLevel = new LazyRow< GatheringItemLevelConvertTable >( gameData, parser.ReadColumn< ushort >( 2 ), language ); Unknown3 = parser.ReadColumn< byte >( 3 ); IsHidden = parser.ReadColumn< bool >( 4 ); Unknown5 = parser.ReadColumn< bool >( 5 ); - FishingRecordType = new LazyRow< FishingRecordType >( lumina, parser.ReadColumn< byte >( 6 ), language ); - TerritoryType = new LazyRow< TerritoryType >( lumina, parser.ReadColumn< int >( 7 ), language ); - GatheringSubCategory = new LazyRow< GatheringSubCategory >( lumina, parser.ReadColumn< ushort >( 8 ), language ); + FishingRecordType = new LazyRow< FishingRecordType >( gameData, parser.ReadColumn< byte >( 6 ), language ); + TerritoryType = new LazyRow< TerritoryType >( gameData, parser.ReadColumn< int >( 7 ), language ); + GatheringSubCategory = new LazyRow< GatheringSubCategory >( gameData, parser.ReadColumn< ushort >( 8 ), language ); IsInLog = parser.ReadColumn< bool >( 9 ); TimeRestricted = parser.ReadColumn< bool >( 10 ); WeatherRestricted = parser.ReadColumn< bool >( 11 ); diff --git a/src/Lumina.Excel/GeneratedSheets/FishingRecordType.cs b/src/Lumina.Excel/GeneratedSheets/FishingRecordType.cs index bdb5c374..c8671f64 100644 --- a/src/Lumina.Excel/GeneratedSheets/FishingRecordType.cs +++ b/src/Lumina.Excel/GeneratedSheets/FishingRecordType.cs @@ -7,26 +7,22 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "FishingRecordType", columnHash: 0x2c75ba5d )] - public class FishingRecordType : IExcelRow + public class FishingRecordType : ExcelRow { - public LazyRow< Addon > Addon; - public ushort RankBRequirement; - public ushort RankARequirement; - public ushort RankAARequirement; - public ushort RankAAARequirement; - public ushort Unknown5; - public byte Unknown6; + public LazyRow< Addon > Addon { get; set; } + public ushort RankBRequirement { get; set; } + public ushort RankARequirement { get; set; } + public ushort RankAARequirement { get; set; } + public ushort RankAAARequirement { get; set; } + public ushort Unknown5 { get; set; } + public byte Unknown6 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Addon = new LazyRow< Addon >( lumina, parser.ReadColumn< int >( 0 ), language ); + Addon = new LazyRow< Addon >( gameData, parser.ReadColumn< int >( 0 ), language ); RankBRequirement = parser.ReadColumn< ushort >( 1 ); RankARequirement = parser.ReadColumn< ushort >( 2 ); RankAARequirement = parser.ReadColumn< ushort >( 3 ); diff --git a/src/Lumina.Excel/GeneratedSheets/FishingRecordTypeTransient.cs b/src/Lumina.Excel/GeneratedSheets/FishingRecordTypeTransient.cs index b9b32199..a21b3c63 100644 --- a/src/Lumina.Excel/GeneratedSheets/FishingRecordTypeTransient.cs +++ b/src/Lumina.Excel/GeneratedSheets/FishingRecordTypeTransient.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "FishingRecordTypeTransient", columnHash: 0xda365c51 )] - public class FishingRecordTypeTransient : IExcelRow + public class FishingRecordTypeTransient : ExcelRow { - public int Image; + public int Image { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Image = parser.ReadColumn< int >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/FishingSpot.cs b/src/Lumina.Excel/GeneratedSheets/FishingSpot.cs index 04111203..d1466623 100644 --- a/src/Lumina.Excel/GeneratedSheets/FishingSpot.cs +++ b/src/Lumina.Excel/GeneratedSheets/FishingSpot.cs @@ -7,49 +7,45 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "FishingSpot", columnHash: 0xbbebac3f )] - public class FishingSpot : IExcelRow + public class FishingSpot : ExcelRow { - public byte GatheringLevel; - public SeString BigFishOnReach; - public SeString BigFishOnEnd; - public byte FishingSpotCategory; - public bool Rare; - public LazyRow< TerritoryType > TerritoryType; - public LazyRow< PlaceName > PlaceNameMain; - public LazyRow< PlaceName > PlaceNameSub; - public short X; - public short Z; - public ushort Radius; - public byte Unknown11; - public LazyRow< Item >[] Item; - public LazyRow< PlaceName > PlaceName; - public byte Order; + public byte GatheringLevel { get; set; } + public SeString BigFishOnReach { get; set; } + public SeString BigFishOnEnd { get; set; } + public byte FishingSpotCategory { get; set; } + public bool Rare { get; set; } + public LazyRow< TerritoryType > TerritoryType { get; set; } + public LazyRow< PlaceName > PlaceNameMain { get; set; } + public LazyRow< PlaceName > PlaceNameSub { get; set; } + public short X { get; set; } + public short Z { get; set; } + public ushort Radius { get; set; } + public byte Unknown11 { get; set; } + public LazyRow< Item >[] Item { get; set; } + public LazyRow< PlaceName > PlaceName { get; set; } + public byte Order { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); GatheringLevel = parser.ReadColumn< byte >( 0 ); BigFishOnReach = parser.ReadColumn< SeString >( 1 ); BigFishOnEnd = parser.ReadColumn< SeString >( 2 ); FishingSpotCategory = parser.ReadColumn< byte >( 3 ); Rare = parser.ReadColumn< bool >( 4 ); - TerritoryType = new LazyRow< TerritoryType >( lumina, parser.ReadColumn< ushort >( 5 ), language ); - PlaceNameMain = new LazyRow< PlaceName >( lumina, parser.ReadColumn< ushort >( 6 ), language ); - PlaceNameSub = new LazyRow< PlaceName >( lumina, parser.ReadColumn< ushort >( 7 ), language ); + TerritoryType = new LazyRow< TerritoryType >( gameData, parser.ReadColumn< ushort >( 5 ), language ); + PlaceNameMain = new LazyRow< PlaceName >( gameData, parser.ReadColumn< ushort >( 6 ), language ); + PlaceNameSub = new LazyRow< PlaceName >( gameData, parser.ReadColumn< ushort >( 7 ), language ); X = parser.ReadColumn< short >( 8 ); Z = parser.ReadColumn< short >( 9 ); Radius = parser.ReadColumn< ushort >( 10 ); Unknown11 = parser.ReadColumn< byte >( 11 ); Item = new LazyRow< Item >[ 10 ]; for( var i = 0; i < 10; i++ ) - Item[ i ] = new LazyRow< Item >( lumina, parser.ReadColumn< int >( 12 + i ), language ); - PlaceName = new LazyRow< PlaceName >( lumina, parser.ReadColumn< ushort >( 22 ), language ); + Item[ i ] = new LazyRow< Item >( gameData, parser.ReadColumn< int >( 12 + i ), language ); + PlaceName = new LazyRow< PlaceName >( gameData, parser.ReadColumn< ushort >( 22 ), language ); Order = parser.ReadColumn< byte >( 23 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/Frontline03.cs b/src/Lumina.Excel/GeneratedSheets/Frontline03.cs index 6bcfa1a4..d4e9c4c5 100644 --- a/src/Lumina.Excel/GeneratedSheets/Frontline03.cs +++ b/src/Lumina.Excel/GeneratedSheets/Frontline03.cs @@ -7,30 +7,26 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Frontline03", columnHash: 0x605090e3 )] - public class Frontline03 : IExcelRow + public class Frontline03 : ExcelRow { - public byte Unknown0; - public byte Unknown1; - public byte Unknown2; - public byte Unknown3; - public byte Unknown4; - public byte Unknown5; - public byte Unknown6; - public byte Unknown7; - public byte Unknown8; - public uint[] EmptyIcon; - public uint[] MaelstromIcon; - public uint[] TwinAdderIcon; - public uint[] ImmortalFlamesIcon; + public byte Unknown0 { get; set; } + public byte Unknown1 { get; set; } + public byte Unknown2 { get; set; } + public byte Unknown3 { get; set; } + public byte Unknown4 { get; set; } + public byte Unknown5 { get; set; } + public byte Unknown6 { get; set; } + public byte Unknown7 { get; set; } + public byte Unknown8 { get; set; } + public uint[] EmptyIcon { get; set; } + public uint[] MaelstromIcon { get; set; } + public uint[] TwinAdderIcon { get; set; } + public uint[] ImmortalFlamesIcon { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< byte >( 0 ); Unknown1 = parser.ReadColumn< byte >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/Frontline04.cs b/src/Lumina.Excel/GeneratedSheets/Frontline04.cs index 33efe1a6..810a5fe1 100644 --- a/src/Lumina.Excel/GeneratedSheets/Frontline04.cs +++ b/src/Lumina.Excel/GeneratedSheets/Frontline04.cs @@ -7,370 +7,366 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Frontline04", columnHash: 0x26885afa )] - public class Frontline04 : IExcelRow + public class Frontline04 : ExcelRow { - public LazyRow< Level > Level1; - public LazyRow< Level > Level2; - public LazyRow< Level > Level3; - public int Unknown3; - public int Unknown4; - public int Unknown5; - public LazyRow< Level >[] UnknownLevel; - public int Unknown33; - public int Unknown34; - public int Unknown35; - public int Unknown36; - public int Unknown37; - public int Unknown38; - public int Unknown39; - public int Unknown40; - public int Unknown41; - public int Unknown42; - public int Unknown43; - public int Unknown44; - public int Unknown45; - public int Unknown46; - public int Unknown47; - public int Unknown48; - public int Unknown49; - public int Unknown50; - public int Unknown51; - public int Unknown52; - public int Unknown53; - public int Unknown54; - public int Unknown55; - public int Unknown56; - public int Unknown57; - public int Unknown58; - public int Unknown59; - public int Unknown60; - public int Unknown61; - public int Unknown62; - public int Unknown63; - public int Unknown64; - public int Unknown65; - public int Unknown66; - public int Unknown67; - public int Unknown68; - public int Unknown69; - public int Unknown70; - public int Unknown71; - public int Unknown72; - public int Unknown73; - public int Unknown74; - public int Unknown75; - public int Unknown76; - public int Unknown77; - public int Unknown78; - public int Unknown79; - public int Unknown80; - public int Unknown81; - public int Unknown82; - public int Unknown83; - public int Unknown84; - public int Unknown85; - public int Unknown86; - public int Unknown87; - public int Unknown88; - public byte Unknown89; - public byte Unknown90; - public byte Unknown91; - public byte Unknown92; - public byte Unknown93; - public byte Unknown94; - public byte Unknown95; - public byte Unknown96; - public byte Unknown97; - public byte Unknown98; - public byte Unknown99; - public byte Unknown100; - public byte Unknown101; - public byte Unknown102; - public byte Unknown103; - public byte Unknown104; - public byte Unknown105; - public byte Unknown106; - public byte Unknown107; - public byte Unknown108; - public byte Unknown109; - public byte Unknown110; - public byte Unknown111; - public byte Unknown112; - public byte Unknown113; - public byte Unknown114; - public byte Unknown115; - public byte Unknown116; - public byte Unknown117; - public byte Unknown118; - public byte Unknown119; - public byte Unknown120; - public byte Unknown121; - public byte Unknown122; - public byte Unknown123; - public byte Unknown124; - public byte Unknown125; - public byte Unknown126; - public byte Unknown127; - public byte Unknown128; - public byte Unknown129; - public byte Unknown130; - public byte Unknown131; - public byte Unknown132; - public byte Unknown133; - public byte Unknown134; - public byte Unknown135; - public byte Unknown136; - public byte Unknown137; - public byte Unknown138; - public byte Unknown139; - public byte Unknown140; - public byte Unknown141; - public byte Unknown142; - public byte Unknown143; - public byte Unknown144; - public byte Unknown145; - public byte Unknown146; - public byte Unknown147; - public byte Unknown148; - public byte Unknown149; - public byte Unknown150; - public byte Unknown151; - public byte Unknown152; - public byte Unknown153; - public byte Unknown154; - public byte Unknown155; - public byte Unknown156; - public byte Unknown157; - public byte Unknown158; - public byte Unknown159; - public byte Unknown160; - public byte Unknown161; - public byte Unknown162; - public byte Unknown163; - public byte Unknown164; - public byte Unknown165; - public byte Unknown166; - public byte Unknown167; - public byte Unknown168; - public byte Unknown169; - public byte Unknown170; - public byte Unknown171; - public byte Unknown172; - public byte Unknown173; - public byte Unknown174; - public byte Unknown175; - public byte Unknown176; - public byte Unknown177; - public byte Unknown178; - public byte Unknown179; - public byte Unknown180; - public byte Unknown181; - public byte Unknown182; - public byte Unknown183; - public byte Unknown184; - public byte Unknown185; - public byte Unknown186; - public byte Unknown187; - public byte Unknown188; - public byte Unknown189; - public byte Unknown190; - public byte Unknown191; - public byte Unknown192; - public byte Unknown193; - public byte Unknown194; - public byte Unknown195; - public byte Unknown196; - public byte Unknown197; - public byte Unknown198; - public byte Unknown199; - public byte Unknown200; - public byte Unknown201; - public byte Unknown202; - public byte Unknown203; - public byte Unknown204; - public byte Unknown205; - public byte Unknown206; - public byte Unknown207; - public byte Unknown208; - public byte Unknown209; - public byte Unknown210; - public byte Unknown211; - public byte Unknown212; - public byte Unknown213; - public byte Unknown214; - public byte Unknown215; - public byte Unknown216; - public byte Unknown217; - public byte Unknown218; - public byte Unknown219; - public byte Unknown220; - public byte Unknown221; - public byte Unknown222; - public byte Unknown223; - public byte Unknown224; - public byte Unknown225; - public byte Unknown226; - public byte Unknown227; - public byte Unknown228; - public byte Unknown229; - public byte Unknown230; - public byte Unknown231; - public byte Unknown232; - public byte Unknown233; - public byte Unknown234; - public byte Unknown235; - public byte Unknown236; - public byte Unknown237; - public byte Unknown238; - public byte Unknown239; - public byte Unknown240; - public byte Unknown241; - public byte Unknown242; - public byte Unknown243; - public byte Unknown244; - public byte Unknown245; - public byte Unknown246; - public byte Unknown247; - public byte Unknown248; - public byte Unknown249; - public byte Unknown250; - public byte Unknown251; - public byte Unknown252; - public byte Unknown253; - public byte Unknown254; - public byte Unknown255; - public byte Unknown256; - public byte Unknown257; - public byte Unknown258; - public byte Unknown259; - public byte Unknown260; - public byte Unknown261; - public byte Unknown262; - public byte Unknown263; - public byte Unknown264; - public byte Unknown265; - public byte Unknown266; - public byte Unknown267; - public byte Unknown268; - public byte Unknown269; - public byte Unknown270; - public byte Unknown271; - public byte Unknown272; - public int Unknown273; - public int Unknown274; - public int Unknown275; - public int Unknown276; - public int Unknown277; - public int Unknown278; - public int Unknown279; - public int Unknown280; - public int Unknown281; - public int Unknown282; - public int Unknown283; - public int Unknown284; - public int Unknown285; - public int Unknown286; - public int Unknown287; - public int Unknown288; - public int Unknown289; - public int Unknown290; - public int Unknown291; - public int Unknown292; - public int Unknown293; - public int Unknown294; - public int Unknown295; - public int Unknown296; - public int Unknown297; - public int Unknown298; - public int Unknown299; - public int Unknown300; - public int Unknown301; - public int Unknown302; - public int Unknown303; - public int Unknown304; - public int Unknown305; - public int Unknown306; - public int Unknown307; - public int Unknown308; - public int Unknown309; - public int Unknown310; - public int Unknown311; - public int Unknown312; - public int Unknown313; - public int Unknown314; - public int Unknown315; - public int Unknown316; - public int Unknown317; - public int Unknown318; - public int Unknown319; - public int Unknown320; - public int Unknown321; - public int Unknown322; - public int Unknown323; - public int Unknown324; - public int Unknown325; - public int Unknown326; - public int Unknown327; - public int Unknown328; - public int Unknown329; - public int Unknown330; - public int Unknown331; - public int Unknown332; - public int Unknown333; - public int Unknown334; - public int Unknown335; - public int Unknown336; - public int Unknown337; - public int Unknown338; - public int Unknown339; - public int Unknown340; - public int Unknown341; - public int Unknown342; - public int Unknown343; - public int Unknown344; - public int Unknown345; - public int Unknown346; - public int Unknown347; - public int Unknown348; - public int Unknown349; - public int Unknown350; - public int Unknown351; - public int Unknown352; - public int Unknown353; - public int Unknown354; - public int Unknown355; - public int Unknown356; - public int Unknown357; - public int Unknown358; - public int Unknown359; - public int Unknown360; - public int Unknown361; - public int Unknown362; - public int Unknown363; - public int Unknown364; - public int Unknown365; - public int Unknown366; - public int Unknown367; - public int Unknown368; + public LazyRow< Level > Level1 { get; set; } + public LazyRow< Level > Level2 { get; set; } + public LazyRow< Level > Level3 { get; set; } + public int Unknown3 { get; set; } + public int Unknown4 { get; set; } + public int Unknown5 { get; set; } + public LazyRow< Level >[] UnknownLevel { get; set; } + public int Unknown33 { get; set; } + public int Unknown34 { get; set; } + public int Unknown35 { get; set; } + public int Unknown36 { get; set; } + public int Unknown37 { get; set; } + public int Unknown38 { get; set; } + public int Unknown39 { get; set; } + public int Unknown40 { get; set; } + public int Unknown41 { get; set; } + public int Unknown42 { get; set; } + public int Unknown43 { get; set; } + public int Unknown44 { get; set; } + public int Unknown45 { get; set; } + public int Unknown46 { get; set; } + public int Unknown47 { get; set; } + public int Unknown48 { get; set; } + public int Unknown49 { get; set; } + public int Unknown50 { get; set; } + public int Unknown51 { get; set; } + public int Unknown52 { get; set; } + public int Unknown53 { get; set; } + public int Unknown54 { get; set; } + public int Unknown55 { get; set; } + public int Unknown56 { get; set; } + public int Unknown57 { get; set; } + public int Unknown58 { get; set; } + public int Unknown59 { get; set; } + public int Unknown60 { get; set; } + public int Unknown61 { get; set; } + public int Unknown62 { get; set; } + public int Unknown63 { get; set; } + public int Unknown64 { get; set; } + public int Unknown65 { get; set; } + public int Unknown66 { get; set; } + public int Unknown67 { get; set; } + public int Unknown68 { get; set; } + public int Unknown69 { get; set; } + public int Unknown70 { get; set; } + public int Unknown71 { get; set; } + public int Unknown72 { get; set; } + public int Unknown73 { get; set; } + public int Unknown74 { get; set; } + public int Unknown75 { get; set; } + public int Unknown76 { get; set; } + public int Unknown77 { get; set; } + public int Unknown78 { get; set; } + public int Unknown79 { get; set; } + public int Unknown80 { get; set; } + public int Unknown81 { get; set; } + public int Unknown82 { get; set; } + public int Unknown83 { get; set; } + public int Unknown84 { get; set; } + public int Unknown85 { get; set; } + public int Unknown86 { get; set; } + public int Unknown87 { get; set; } + public int Unknown88 { get; set; } + public byte Unknown89 { get; set; } + public byte Unknown90 { get; set; } + public byte Unknown91 { get; set; } + public byte Unknown92 { get; set; } + public byte Unknown93 { get; set; } + public byte Unknown94 { get; set; } + public byte Unknown95 { get; set; } + public byte Unknown96 { get; set; } + public byte Unknown97 { get; set; } + public byte Unknown98 { get; set; } + public byte Unknown99 { get; set; } + public byte Unknown100 { get; set; } + public byte Unknown101 { get; set; } + public byte Unknown102 { get; set; } + public byte Unknown103 { get; set; } + public byte Unknown104 { get; set; } + public byte Unknown105 { get; set; } + public byte Unknown106 { get; set; } + public byte Unknown107 { get; set; } + public byte Unknown108 { get; set; } + public byte Unknown109 { get; set; } + public byte Unknown110 { get; set; } + public byte Unknown111 { get; set; } + public byte Unknown112 { get; set; } + public byte Unknown113 { get; set; } + public byte Unknown114 { get; set; } + public byte Unknown115 { get; set; } + public byte Unknown116 { get; set; } + public byte Unknown117 { get; set; } + public byte Unknown118 { get; set; } + public byte Unknown119 { get; set; } + public byte Unknown120 { get; set; } + public byte Unknown121 { get; set; } + public byte Unknown122 { get; set; } + public byte Unknown123 { get; set; } + public byte Unknown124 { get; set; } + public byte Unknown125 { get; set; } + public byte Unknown126 { get; set; } + public byte Unknown127 { get; set; } + public byte Unknown128 { get; set; } + public byte Unknown129 { get; set; } + public byte Unknown130 { get; set; } + public byte Unknown131 { get; set; } + public byte Unknown132 { get; set; } + public byte Unknown133 { get; set; } + public byte Unknown134 { get; set; } + public byte Unknown135 { get; set; } + public byte Unknown136 { get; set; } + public byte Unknown137 { get; set; } + public byte Unknown138 { get; set; } + public byte Unknown139 { get; set; } + public byte Unknown140 { get; set; } + public byte Unknown141 { get; set; } + public byte Unknown142 { get; set; } + public byte Unknown143 { get; set; } + public byte Unknown144 { get; set; } + public byte Unknown145 { get; set; } + public byte Unknown146 { get; set; } + public byte Unknown147 { get; set; } + public byte Unknown148 { get; set; } + public byte Unknown149 { get; set; } + public byte Unknown150 { get; set; } + public byte Unknown151 { get; set; } + public byte Unknown152 { get; set; } + public byte Unknown153 { get; set; } + public byte Unknown154 { get; set; } + public byte Unknown155 { get; set; } + public byte Unknown156 { get; set; } + public byte Unknown157 { get; set; } + public byte Unknown158 { get; set; } + public byte Unknown159 { get; set; } + public byte Unknown160 { get; set; } + public byte Unknown161 { get; set; } + public byte Unknown162 { get; set; } + public byte Unknown163 { get; set; } + public byte Unknown164 { get; set; } + public byte Unknown165 { get; set; } + public byte Unknown166 { get; set; } + public byte Unknown167 { get; set; } + public byte Unknown168 { get; set; } + public byte Unknown169 { get; set; } + public byte Unknown170 { get; set; } + public byte Unknown171 { get; set; } + public byte Unknown172 { get; set; } + public byte Unknown173 { get; set; } + public byte Unknown174 { get; set; } + public byte Unknown175 { get; set; } + public byte Unknown176 { get; set; } + public byte Unknown177 { get; set; } + public byte Unknown178 { get; set; } + public byte Unknown179 { get; set; } + public byte Unknown180 { get; set; } + public byte Unknown181 { get; set; } + public byte Unknown182 { get; set; } + public byte Unknown183 { get; set; } + public byte Unknown184 { get; set; } + public byte Unknown185 { get; set; } + public byte Unknown186 { get; set; } + public byte Unknown187 { get; set; } + public byte Unknown188 { get; set; } + public byte Unknown189 { get; set; } + public byte Unknown190 { get; set; } + public byte Unknown191 { get; set; } + public byte Unknown192 { get; set; } + public byte Unknown193 { get; set; } + public byte Unknown194 { get; set; } + public byte Unknown195 { get; set; } + public byte Unknown196 { get; set; } + public byte Unknown197 { get; set; } + public byte Unknown198 { get; set; } + public byte Unknown199 { get; set; } + public byte Unknown200 { get; set; } + public byte Unknown201 { get; set; } + public byte Unknown202 { get; set; } + public byte Unknown203 { get; set; } + public byte Unknown204 { get; set; } + public byte Unknown205 { get; set; } + public byte Unknown206 { get; set; } + public byte Unknown207 { get; set; } + public byte Unknown208 { get; set; } + public byte Unknown209 { get; set; } + public byte Unknown210 { get; set; } + public byte Unknown211 { get; set; } + public byte Unknown212 { get; set; } + public byte Unknown213 { get; set; } + public byte Unknown214 { get; set; } + public byte Unknown215 { get; set; } + public byte Unknown216 { get; set; } + public byte Unknown217 { get; set; } + public byte Unknown218 { get; set; } + public byte Unknown219 { get; set; } + public byte Unknown220 { get; set; } + public byte Unknown221 { get; set; } + public byte Unknown222 { get; set; } + public byte Unknown223 { get; set; } + public byte Unknown224 { get; set; } + public byte Unknown225 { get; set; } + public byte Unknown226 { get; set; } + public byte Unknown227 { get; set; } + public byte Unknown228 { get; set; } + public byte Unknown229 { get; set; } + public byte Unknown230 { get; set; } + public byte Unknown231 { get; set; } + public byte Unknown232 { get; set; } + public byte Unknown233 { get; set; } + public byte Unknown234 { get; set; } + public byte Unknown235 { get; set; } + public byte Unknown236 { get; set; } + public byte Unknown237 { get; set; } + public byte Unknown238 { get; set; } + public byte Unknown239 { get; set; } + public byte Unknown240 { get; set; } + public byte Unknown241 { get; set; } + public byte Unknown242 { get; set; } + public byte Unknown243 { get; set; } + public byte Unknown244 { get; set; } + public byte Unknown245 { get; set; } + public byte Unknown246 { get; set; } + public byte Unknown247 { get; set; } + public byte Unknown248 { get; set; } + public byte Unknown249 { get; set; } + public byte Unknown250 { get; set; } + public byte Unknown251 { get; set; } + public byte Unknown252 { get; set; } + public byte Unknown253 { get; set; } + public byte Unknown254 { get; set; } + public byte Unknown255 { get; set; } + public byte Unknown256 { get; set; } + public byte Unknown257 { get; set; } + public byte Unknown258 { get; set; } + public byte Unknown259 { get; set; } + public byte Unknown260 { get; set; } + public byte Unknown261 { get; set; } + public byte Unknown262 { get; set; } + public byte Unknown263 { get; set; } + public byte Unknown264 { get; set; } + public byte Unknown265 { get; set; } + public byte Unknown266 { get; set; } + public byte Unknown267 { get; set; } + public byte Unknown268 { get; set; } + public byte Unknown269 { get; set; } + public byte Unknown270 { get; set; } + public byte Unknown271 { get; set; } + public byte Unknown272 { get; set; } + public int Unknown273 { get; set; } + public int Unknown274 { get; set; } + public int Unknown275 { get; set; } + public int Unknown276 { get; set; } + public int Unknown277 { get; set; } + public int Unknown278 { get; set; } + public int Unknown279 { get; set; } + public int Unknown280 { get; set; } + public int Unknown281 { get; set; } + public int Unknown282 { get; set; } + public int Unknown283 { get; set; } + public int Unknown284 { get; set; } + public int Unknown285 { get; set; } + public int Unknown286 { get; set; } + public int Unknown287 { get; set; } + public int Unknown288 { get; set; } + public int Unknown289 { get; set; } + public int Unknown290 { get; set; } + public int Unknown291 { get; set; } + public int Unknown292 { get; set; } + public int Unknown293 { get; set; } + public int Unknown294 { get; set; } + public int Unknown295 { get; set; } + public int Unknown296 { get; set; } + public int Unknown297 { get; set; } + public int Unknown298 { get; set; } + public int Unknown299 { get; set; } + public int Unknown300 { get; set; } + public int Unknown301 { get; set; } + public int Unknown302 { get; set; } + public int Unknown303 { get; set; } + public int Unknown304 { get; set; } + public int Unknown305 { get; set; } + public int Unknown306 { get; set; } + public int Unknown307 { get; set; } + public int Unknown308 { get; set; } + public int Unknown309 { get; set; } + public int Unknown310 { get; set; } + public int Unknown311 { get; set; } + public int Unknown312 { get; set; } + public int Unknown313 { get; set; } + public int Unknown314 { get; set; } + public int Unknown315 { get; set; } + public int Unknown316 { get; set; } + public int Unknown317 { get; set; } + public int Unknown318 { get; set; } + public int Unknown319 { get; set; } + public int Unknown320 { get; set; } + public int Unknown321 { get; set; } + public int Unknown322 { get; set; } + public int Unknown323 { get; set; } + public int Unknown324 { get; set; } + public int Unknown325 { get; set; } + public int Unknown326 { get; set; } + public int Unknown327 { get; set; } + public int Unknown328 { get; set; } + public int Unknown329 { get; set; } + public int Unknown330 { get; set; } + public int Unknown331 { get; set; } + public int Unknown332 { get; set; } + public int Unknown333 { get; set; } + public int Unknown334 { get; set; } + public int Unknown335 { get; set; } + public int Unknown336 { get; set; } + public int Unknown337 { get; set; } + public int Unknown338 { get; set; } + public int Unknown339 { get; set; } + public int Unknown340 { get; set; } + public int Unknown341 { get; set; } + public int Unknown342 { get; set; } + public int Unknown343 { get; set; } + public int Unknown344 { get; set; } + public int Unknown345 { get; set; } + public int Unknown346 { get; set; } + public int Unknown347 { get; set; } + public int Unknown348 { get; set; } + public int Unknown349 { get; set; } + public int Unknown350 { get; set; } + public int Unknown351 { get; set; } + public int Unknown352 { get; set; } + public int Unknown353 { get; set; } + public int Unknown354 { get; set; } + public int Unknown355 { get; set; } + public int Unknown356 { get; set; } + public int Unknown357 { get; set; } + public int Unknown358 { get; set; } + public int Unknown359 { get; set; } + public int Unknown360 { get; set; } + public int Unknown361 { get; set; } + public int Unknown362 { get; set; } + public int Unknown363 { get; set; } + public int Unknown364 { get; set; } + public int Unknown365 { get; set; } + public int Unknown366 { get; set; } + public int Unknown367 { get; set; } + public int Unknown368 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Level1 = new LazyRow< Level >( lumina, parser.ReadColumn< int >( 0 ), language ); - Level2 = new LazyRow< Level >( lumina, parser.ReadColumn< int >( 1 ), language ); - Level3 = new LazyRow< Level >( lumina, parser.ReadColumn< int >( 2 ), language ); + Level1 = new LazyRow< Level >( gameData, parser.ReadColumn< int >( 0 ), language ); + Level2 = new LazyRow< Level >( gameData, parser.ReadColumn< int >( 1 ), language ); + Level3 = new LazyRow< Level >( gameData, parser.ReadColumn< int >( 2 ), language ); Unknown3 = parser.ReadColumn< int >( 3 ); Unknown4 = parser.ReadColumn< int >( 4 ); Unknown5 = parser.ReadColumn< int >( 5 ); UnknownLevel = new LazyRow< Level >[ 27 ]; for( var i = 0; i < 27; i++ ) - UnknownLevel[ i ] = new LazyRow< Level >( lumina, parser.ReadColumn< int >( 6 + i ), language ); + UnknownLevel[ i ] = new LazyRow< Level >( gameData, parser.ReadColumn< int >( 6 + i ), language ); Unknown33 = parser.ReadColumn< int >( 33 ); Unknown34 = parser.ReadColumn< int >( 34 ); Unknown35 = parser.ReadColumn< int >( 35 ); diff --git a/src/Lumina.Excel/GeneratedSheets/FurnitureCatalogCategory.cs b/src/Lumina.Excel/GeneratedSheets/FurnitureCatalogCategory.cs index cede64b2..d3d8c107 100644 --- a/src/Lumina.Excel/GeneratedSheets/FurnitureCatalogCategory.cs +++ b/src/Lumina.Excel/GeneratedSheets/FurnitureCatalogCategory.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "FurnitureCatalogCategory", columnHash: 0xc8b7ab9b )] - public class FurnitureCatalogCategory : IExcelRow + public class FurnitureCatalogCategory : ExcelRow { - public SeString Category; - public ushort Unknown1; - public byte Unknown2; + public SeString Category { get; set; } + public ushort Unknown1 { get; set; } + public byte Unknown2 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Category = parser.ReadColumn< SeString >( 0 ); Unknown1 = parser.ReadColumn< ushort >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/FurnitureCatalogItemList.cs b/src/Lumina.Excel/GeneratedSheets/FurnitureCatalogItemList.cs index 0cd3bb7f..493d8b0e 100644 --- a/src/Lumina.Excel/GeneratedSheets/FurnitureCatalogItemList.cs +++ b/src/Lumina.Excel/GeneratedSheets/FurnitureCatalogItemList.cs @@ -7,23 +7,19 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "FurnitureCatalogItemList", columnHash: 0x24e9963a )] - public class FurnitureCatalogItemList : IExcelRow + public class FurnitureCatalogItemList : ExcelRow { - public LazyRow< FurnitureCatalogCategory > Category; - public LazyRow< Item > Item; - public ushort Patch; + public LazyRow< FurnitureCatalogCategory > Category { get; set; } + public LazyRow< Item > Item { get; set; } + public ushort Patch { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Category = new LazyRow< FurnitureCatalogCategory >( lumina, parser.ReadColumn< ushort >( 0 ), language ); - Item = new LazyRow< Item >( lumina, parser.ReadColumn< int >( 1 ), language ); + Category = new LazyRow< FurnitureCatalogCategory >( gameData, parser.ReadColumn< ushort >( 0 ), language ); + Item = new LazyRow< Item >( gameData, parser.ReadColumn< int >( 1 ), language ); Patch = parser.ReadColumn< ushort >( 2 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/GCRankGridaniaFemaleText.cs b/src/Lumina.Excel/GeneratedSheets/GCRankGridaniaFemaleText.cs index cb929e25..7f658cda 100644 --- a/src/Lumina.Excel/GeneratedSheets/GCRankGridaniaFemaleText.cs +++ b/src/Lumina.Excel/GeneratedSheets/GCRankGridaniaFemaleText.cs @@ -7,27 +7,23 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GCRankGridaniaFemaleText", columnHash: 0xd573cba6 )] - public class GCRankGridaniaFemaleText : IExcelRow + public class GCRankGridaniaFemaleText : ExcelRow { - public SeString Singular; - public sbyte Adjective; - public SeString Plural; - public sbyte PossessivePronoun; - public sbyte StartsWithVowel; - public sbyte Unknown5; - public sbyte Pronoun; - public sbyte Article; - public SeString NameRank; - public SeString Unknown9; + public SeString Singular { get; set; } + public sbyte Adjective { get; set; } + public SeString Plural { get; set; } + public sbyte PossessivePronoun { get; set; } + public sbyte StartsWithVowel { get; set; } + public sbyte Unknown5 { get; set; } + public sbyte Pronoun { get; set; } + public sbyte Article { get; set; } + public SeString NameRank { get; set; } + public SeString Unknown9 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Singular = parser.ReadColumn< SeString >( 0 ); Adjective = parser.ReadColumn< sbyte >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/GCRankGridaniaMaleText.cs b/src/Lumina.Excel/GeneratedSheets/GCRankGridaniaMaleText.cs index ed905b8a..192ac0bd 100644 --- a/src/Lumina.Excel/GeneratedSheets/GCRankGridaniaMaleText.cs +++ b/src/Lumina.Excel/GeneratedSheets/GCRankGridaniaMaleText.cs @@ -7,27 +7,23 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GCRankGridaniaMaleText", columnHash: 0xd573cba6 )] - public class GCRankGridaniaMaleText : IExcelRow + public class GCRankGridaniaMaleText : ExcelRow { - public SeString Singular; - public sbyte Adjective; - public SeString Plural; - public sbyte PossessivePronoun; - public sbyte StartsWithVowel; - public sbyte Unknown5; - public sbyte Pronoun; - public sbyte Article; - public SeString NameRank; - public SeString Unknown9; + public SeString Singular { get; set; } + public sbyte Adjective { get; set; } + public SeString Plural { get; set; } + public sbyte PossessivePronoun { get; set; } + public sbyte StartsWithVowel { get; set; } + public sbyte Unknown5 { get; set; } + public sbyte Pronoun { get; set; } + public sbyte Article { get; set; } + public SeString NameRank { get; set; } + public SeString Unknown9 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Singular = parser.ReadColumn< SeString >( 0 ); Adjective = parser.ReadColumn< sbyte >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/GCRankLimsaFemaleText.cs b/src/Lumina.Excel/GeneratedSheets/GCRankLimsaFemaleText.cs index 9aca0237..5548fbdf 100644 --- a/src/Lumina.Excel/GeneratedSheets/GCRankLimsaFemaleText.cs +++ b/src/Lumina.Excel/GeneratedSheets/GCRankLimsaFemaleText.cs @@ -7,27 +7,23 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GCRankLimsaFemaleText", columnHash: 0xd573cba6 )] - public class GCRankLimsaFemaleText : IExcelRow + public class GCRankLimsaFemaleText : ExcelRow { - public SeString Singular; - public sbyte Adjective; - public SeString Plural; - public sbyte PossessivePronoun; - public sbyte StartsWithVowel; - public sbyte Unknown5; - public sbyte Pronoun; - public sbyte Article; - public SeString NameRank; - public SeString Unknown9; + public SeString Singular { get; set; } + public sbyte Adjective { get; set; } + public SeString Plural { get; set; } + public sbyte PossessivePronoun { get; set; } + public sbyte StartsWithVowel { get; set; } + public sbyte Unknown5 { get; set; } + public sbyte Pronoun { get; set; } + public sbyte Article { get; set; } + public SeString NameRank { get; set; } + public SeString Unknown9 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Singular = parser.ReadColumn< SeString >( 0 ); Adjective = parser.ReadColumn< sbyte >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/GCRankLimsaMaleText.cs b/src/Lumina.Excel/GeneratedSheets/GCRankLimsaMaleText.cs index 86a136ef..569dcd54 100644 --- a/src/Lumina.Excel/GeneratedSheets/GCRankLimsaMaleText.cs +++ b/src/Lumina.Excel/GeneratedSheets/GCRankLimsaMaleText.cs @@ -7,27 +7,23 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GCRankLimsaMaleText", columnHash: 0xd573cba6 )] - public class GCRankLimsaMaleText : IExcelRow + public class GCRankLimsaMaleText : ExcelRow { - public SeString Singular; - public sbyte Adjective; - public SeString Plural; - public sbyte PossessivePronoun; - public sbyte StartsWithVowel; - public sbyte Unknown5; - public sbyte Pronoun; - public sbyte Article; - public SeString NameRank; - public SeString Unknown9; + public SeString Singular { get; set; } + public sbyte Adjective { get; set; } + public SeString Plural { get; set; } + public sbyte PossessivePronoun { get; set; } + public sbyte StartsWithVowel { get; set; } + public sbyte Unknown5 { get; set; } + public sbyte Pronoun { get; set; } + public sbyte Article { get; set; } + public SeString NameRank { get; set; } + public SeString Unknown9 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Singular = parser.ReadColumn< SeString >( 0 ); Adjective = parser.ReadColumn< sbyte >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/GCRankUldahFemaleText.cs b/src/Lumina.Excel/GeneratedSheets/GCRankUldahFemaleText.cs index d5ae6889..a0cf2bfa 100644 --- a/src/Lumina.Excel/GeneratedSheets/GCRankUldahFemaleText.cs +++ b/src/Lumina.Excel/GeneratedSheets/GCRankUldahFemaleText.cs @@ -7,27 +7,23 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GCRankUldahFemaleText", columnHash: 0xd573cba6 )] - public class GCRankUldahFemaleText : IExcelRow + public class GCRankUldahFemaleText : ExcelRow { - public SeString Singular; - public sbyte Adjective; - public SeString Plural; - public sbyte PossessivePronoun; - public sbyte StartsWithVowel; - public sbyte Unknown5; - public sbyte Pronoun; - public sbyte Article; - public SeString NameRank; - public SeString Unknown9; + public SeString Singular { get; set; } + public sbyte Adjective { get; set; } + public SeString Plural { get; set; } + public sbyte PossessivePronoun { get; set; } + public sbyte StartsWithVowel { get; set; } + public sbyte Unknown5 { get; set; } + public sbyte Pronoun { get; set; } + public sbyte Article { get; set; } + public SeString NameRank { get; set; } + public SeString Unknown9 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Singular = parser.ReadColumn< SeString >( 0 ); Adjective = parser.ReadColumn< sbyte >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/GCRankUldahMaleText.cs b/src/Lumina.Excel/GeneratedSheets/GCRankUldahMaleText.cs index 449acae1..1021b564 100644 --- a/src/Lumina.Excel/GeneratedSheets/GCRankUldahMaleText.cs +++ b/src/Lumina.Excel/GeneratedSheets/GCRankUldahMaleText.cs @@ -7,27 +7,23 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GCRankUldahMaleText", columnHash: 0xd573cba6 )] - public class GCRankUldahMaleText : IExcelRow + public class GCRankUldahMaleText : ExcelRow { - public SeString Singular; - public sbyte Adjective; - public SeString Plural; - public sbyte PossessivePronoun; - public sbyte StartsWithVowel; - public sbyte Unknown5; - public sbyte Pronoun; - public sbyte Article; - public SeString NameRank; - public SeString Unknown9; + public SeString Singular { get; set; } + public sbyte Adjective { get; set; } + public SeString Plural { get; set; } + public sbyte PossessivePronoun { get; set; } + public sbyte StartsWithVowel { get; set; } + public sbyte Unknown5 { get; set; } + public sbyte Pronoun { get; set; } + public sbyte Article { get; set; } + public SeString NameRank { get; set; } + public SeString Unknown9 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Singular = parser.ReadColumn< SeString >( 0 ); Adjective = parser.ReadColumn< sbyte >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/GCScripShopCategory.cs b/src/Lumina.Excel/GeneratedSheets/GCScripShopCategory.cs index 626e8a1a..dd37a10d 100644 --- a/src/Lumina.Excel/GeneratedSheets/GCScripShopCategory.cs +++ b/src/Lumina.Excel/GeneratedSheets/GCScripShopCategory.cs @@ -7,22 +7,18 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GCScripShopCategory", columnHash: 0x9b330d8a )] - public class GCScripShopCategory : IExcelRow + public class GCScripShopCategory : ExcelRow { - public LazyRow< GrandCompany > GrandCompany; - public sbyte Tier; - public sbyte SubCategory; + public LazyRow< GrandCompany > GrandCompany { get; set; } + public sbyte Tier { get; set; } + public sbyte SubCategory { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - GrandCompany = new LazyRow< GrandCompany >( lumina, parser.ReadColumn< sbyte >( 0 ), language ); + GrandCompany = new LazyRow< GrandCompany >( gameData, parser.ReadColumn< sbyte >( 0 ), language ); Tier = parser.ReadColumn< sbyte >( 1 ); SubCategory = parser.ReadColumn< sbyte >( 2 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/GCScripShopItem.cs b/src/Lumina.Excel/GeneratedSheets/GCScripShopItem.cs index 22cd9737..b4f9b749 100644 --- a/src/Lumina.Excel/GeneratedSheets/GCScripShopItem.cs +++ b/src/Lumina.Excel/GeneratedSheets/GCScripShopItem.cs @@ -7,24 +7,20 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GCScripShopItem", columnHash: 0x6c3dae69 )] - public class GCScripShopItem : IExcelRow + public class GCScripShopItem : ExcelRow { - public LazyRow< Item > Item; - public LazyRow< GrandCompanyRank > RequiredGrandCompanyRank; - public uint CostGCSeals; - public byte SortKey; + public LazyRow< Item > Item { get; set; } + public LazyRow< GrandCompanyRank > RequiredGrandCompanyRank { get; set; } + public uint CostGCSeals { get; set; } + public byte SortKey { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Item = new LazyRow< Item >( lumina, parser.ReadColumn< int >( 0 ), language ); - RequiredGrandCompanyRank = new LazyRow< GrandCompanyRank >( lumina, parser.ReadColumn< int >( 1 ), language ); + Item = new LazyRow< Item >( gameData, parser.ReadColumn< int >( 0 ), language ); + RequiredGrandCompanyRank = new LazyRow< GrandCompanyRank >( gameData, parser.ReadColumn< int >( 1 ), language ); CostGCSeals = parser.ReadColumn< uint >( 2 ); SortKey = parser.ReadColumn< byte >( 3 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/GCShop.cs b/src/Lumina.Excel/GeneratedSheets/GCShop.cs index af77507d..92d44521 100644 --- a/src/Lumina.Excel/GeneratedSheets/GCShop.cs +++ b/src/Lumina.Excel/GeneratedSheets/GCShop.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GCShop", columnHash: 0xdd3ff48d )] - public class GCShop : IExcelRow + public class GCShop : ExcelRow { - public LazyRow< GrandCompany > GrandCompany; + public LazyRow< GrandCompany > GrandCompany { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - GrandCompany = new LazyRow< GrandCompany >( lumina, parser.ReadColumn< sbyte >( 0 ), language ); + GrandCompany = new LazyRow< GrandCompany >( gameData, parser.ReadColumn< sbyte >( 0 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/GCShopItemCategory.cs b/src/Lumina.Excel/GeneratedSheets/GCShopItemCategory.cs index a0794452..49d0fb73 100644 --- a/src/Lumina.Excel/GeneratedSheets/GCShopItemCategory.cs +++ b/src/Lumina.Excel/GeneratedSheets/GCShopItemCategory.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GCShopItemCategory", columnHash: 0xdebb20e3 )] - public class GCShopItemCategory : IExcelRow + public class GCShopItemCategory : ExcelRow { - public SeString Name; + public SeString Name { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/GCSupplyDuty.cs b/src/Lumina.Excel/GeneratedSheets/GCSupplyDuty.cs index a44ceeb0..e059d8a7 100644 --- a/src/Lumina.Excel/GeneratedSheets/GCSupplyDuty.cs +++ b/src/Lumina.Excel/GeneratedSheets/GCSupplyDuty.cs @@ -7,73 +7,69 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GCSupplyDuty", columnHash: 0xb3265a92 )] - public class GCSupplyDuty : IExcelRow + public class GCSupplyDuty : ExcelRow { - public int[] Unknown0; - public byte Unknown11; - public int Unknown12; - public byte Unknown13; - public int Unknown14; - public byte Unknown15; - public int Unknown16; - public byte Unknown17; - public int Unknown18; - public byte Unknown19; - public int Unknown20; - public byte Unknown21; - public int Unknown22; - public byte Unknown23; - public int Unknown24; - public byte Unknown25; - public int Unknown26; - public byte Unknown27; - public int Unknown28; - public byte Unknown29; - public int Unknown30; - public byte Unknown31; - public int Unknown32; - public byte Unknown33; - public int Unknown34; - public byte Unknown35; - public int Unknown36; - public byte Unknown37; - public int Unknown38; - public byte Unknown39; - public int Unknown40; - public byte Unknown41; - public int Unknown42; - public byte Unknown43; - public int Unknown44; - public byte Unknown45; - public int Unknown46; - public byte Unknown47; - public int Unknown48; - public byte Unknown49; - public int Unknown50; - public byte Unknown51; - public int Unknown52; - public byte Unknown53; - public int Unknown54; - public byte Unknown55; - public int Unknown56; - public byte Unknown57; - public int Unknown58; - public byte Unknown59; - public int Unknown60; - public byte Unknown61; - public int Unknown62; - public byte Unknown63; - public int Unknown64; - public byte Unknown65; + public int[] Unknown0 { get; set; } + public byte Unknown11 { get; set; } + public int Unknown12 { get; set; } + public byte Unknown13 { get; set; } + public int Unknown14 { get; set; } + public byte Unknown15 { get; set; } + public int Unknown16 { get; set; } + public byte Unknown17 { get; set; } + public int Unknown18 { get; set; } + public byte Unknown19 { get; set; } + public int Unknown20 { get; set; } + public byte Unknown21 { get; set; } + public int Unknown22 { get; set; } + public byte Unknown23 { get; set; } + public int Unknown24 { get; set; } + public byte Unknown25 { get; set; } + public int Unknown26 { get; set; } + public byte Unknown27 { get; set; } + public int Unknown28 { get; set; } + public byte Unknown29 { get; set; } + public int Unknown30 { get; set; } + public byte Unknown31 { get; set; } + public int Unknown32 { get; set; } + public byte Unknown33 { get; set; } + public int Unknown34 { get; set; } + public byte Unknown35 { get; set; } + public int Unknown36 { get; set; } + public byte Unknown37 { get; set; } + public int Unknown38 { get; set; } + public byte Unknown39 { get; set; } + public int Unknown40 { get; set; } + public byte Unknown41 { get; set; } + public int Unknown42 { get; set; } + public byte Unknown43 { get; set; } + public int Unknown44 { get; set; } + public byte Unknown45 { get; set; } + public int Unknown46 { get; set; } + public byte Unknown47 { get; set; } + public int Unknown48 { get; set; } + public byte Unknown49 { get; set; } + public int Unknown50 { get; set; } + public byte Unknown51 { get; set; } + public int Unknown52 { get; set; } + public byte Unknown53 { get; set; } + public int Unknown54 { get; set; } + public byte Unknown55 { get; set; } + public int Unknown56 { get; set; } + public byte Unknown57 { get; set; } + public int Unknown58 { get; set; } + public byte Unknown59 { get; set; } + public int Unknown60 { get; set; } + public byte Unknown61 { get; set; } + public int Unknown62 { get; set; } + public byte Unknown63 { get; set; } + public int Unknown64 { get; set; } + public byte Unknown65 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = new int[ 11 ]; for( var i = 0; i < 11; i++ ) diff --git a/src/Lumina.Excel/GeneratedSheets/GCSupplyDutyReward.cs b/src/Lumina.Excel/GeneratedSheets/GCSupplyDutyReward.cs index 8f932ac8..ff64d5b0 100644 --- a/src/Lumina.Excel/GeneratedSheets/GCSupplyDutyReward.cs +++ b/src/Lumina.Excel/GeneratedSheets/GCSupplyDutyReward.cs @@ -7,22 +7,18 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GCSupplyDutyReward", columnHash: 0x6be0e840 )] - public class GCSupplyDutyReward : IExcelRow + public class GCSupplyDutyReward : ExcelRow { - public uint ExperienceSupply; - public uint ExperienceProvisioning; - public uint SealsExpertDelivery; - public uint SealsSupply; - public uint SealsProvisioning; + public uint ExperienceSupply { get; set; } + public uint ExperienceProvisioning { get; set; } + public uint SealsExpertDelivery { get; set; } + public uint SealsSupply { get; set; } + public uint SealsProvisioning { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); ExperienceSupply = parser.ReadColumn< uint >( 0 ); ExperienceProvisioning = parser.ReadColumn< uint >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/GFATE.cs b/src/Lumina.Excel/GeneratedSheets/GFATE.cs index 619d2846..636f6b30 100644 --- a/src/Lumina.Excel/GeneratedSheets/GFATE.cs +++ b/src/Lumina.Excel/GeneratedSheets/GFATE.cs @@ -7,89 +7,85 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GFATE", columnHash: 0x440a2c22 )] - public class GFATE : IExcelRow + public class GFATE : ExcelRow { - public byte Unknown0; - public byte Unknown1; - public uint Unknown2; - public ushort Unknown3; - public ushort Unknown4; - public ushort Unknown5; - public uint Unknown6; - public uint Unknown7; - public uint Unknown8; - public uint Unknown9; - public uint Unknown10; - public uint Unknown11; - public uint Unknown12; - public uint Unknown13; - public uint Unknown14; - public uint Unknown15; - public uint Unknown16; - public uint Unknown17; - public uint Unknown18; - public uint Unknown19; - public uint Unknown20; - public uint Unknown21; - public uint[] Icon; - public uint Unknown38; - public bool Unknown39; - public bool Unknown40; - public bool Unknown41; - public bool Unknown42; - public bool Unknown43; - public bool Unknown44; - public bool Unknown45; - public bool Unknown46; - public bool Unknown47; - public bool Unknown48; - public bool Unknown49; - public bool Unknown50; - public bool Unknown51; - public bool Unknown52; - public bool Unknown53; - public bool Unknown54; - public bool Unknown55; - public bool Unknown56; - public bool Unknown57; - public bool Unknown58; - public bool Unknown59; - public bool Unknown60; - public bool Unknown61; - public bool Unknown62; - public bool Unknown63; - public bool Unknown64; - public bool Unknown65; - public bool Unknown66; - public bool Unknown67; - public bool Unknown68; - public bool Unknown69; - public bool Unknown70; - public bool Unknown71; - public bool Unknown72; - public bool Unknown73; - public bool Unknown74; - public bool Unknown75; - public bool Unknown76; - public bool Unknown77; - public bool Unknown78; - public bool Unknown79; - public bool Unknown80; - public bool Unknown81; - public bool Unknown82; - public bool Unknown83; - public bool Unknown84; - public bool Unknown85; - public bool Unknown86; + public byte Unknown0 { get; set; } + public byte Unknown1 { get; set; } + public uint Unknown2 { get; set; } + public ushort Unknown3 { get; set; } + public ushort Unknown4 { get; set; } + public ushort Unknown5 { get; set; } + public uint Unknown6 { get; set; } + public uint Unknown7 { get; set; } + public uint Unknown8 { get; set; } + public uint Unknown9 { get; set; } + public uint Unknown10 { get; set; } + public uint Unknown11 { get; set; } + public uint Unknown12 { get; set; } + public uint Unknown13 { get; set; } + public uint Unknown14 { get; set; } + public uint Unknown15 { get; set; } + public uint Unknown16 { get; set; } + public uint Unknown17 { get; set; } + public uint Unknown18 { get; set; } + public uint Unknown19 { get; set; } + public uint Unknown20 { get; set; } + public uint Unknown21 { get; set; } + public uint[] Icon { get; set; } + public uint Unknown38 { get; set; } + public bool Unknown39 { get; set; } + public bool Unknown40 { get; set; } + public bool Unknown41 { get; set; } + public bool Unknown42 { get; set; } + public bool Unknown43 { get; set; } + public bool Unknown44 { get; set; } + public bool Unknown45 { get; set; } + public bool Unknown46 { get; set; } + public bool Unknown47 { get; set; } + public bool Unknown48 { get; set; } + public bool Unknown49 { get; set; } + public bool Unknown50 { get; set; } + public bool Unknown51 { get; set; } + public bool Unknown52 { get; set; } + public bool Unknown53 { get; set; } + public bool Unknown54 { get; set; } + public bool Unknown55 { get; set; } + public bool Unknown56 { get; set; } + public bool Unknown57 { get; set; } + public bool Unknown58 { get; set; } + public bool Unknown59 { get; set; } + public bool Unknown60 { get; set; } + public bool Unknown61 { get; set; } + public bool Unknown62 { get; set; } + public bool Unknown63 { get; set; } + public bool Unknown64 { get; set; } + public bool Unknown65 { get; set; } + public bool Unknown66 { get; set; } + public bool Unknown67 { get; set; } + public bool Unknown68 { get; set; } + public bool Unknown69 { get; set; } + public bool Unknown70 { get; set; } + public bool Unknown71 { get; set; } + public bool Unknown72 { get; set; } + public bool Unknown73 { get; set; } + public bool Unknown74 { get; set; } + public bool Unknown75 { get; set; } + public bool Unknown76 { get; set; } + public bool Unknown77 { get; set; } + public bool Unknown78 { get; set; } + public bool Unknown79 { get; set; } + public bool Unknown80 { get; set; } + public bool Unknown81 { get; set; } + public bool Unknown82 { get; set; } + public bool Unknown83 { get; set; } + public bool Unknown84 { get; set; } + public bool Unknown85 { get; set; } + public bool Unknown86 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< byte >( 0 ); Unknown1 = parser.ReadColumn< byte >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/GFateClimbing2.cs b/src/Lumina.Excel/GeneratedSheets/GFateClimbing2.cs index 5b292122..c20e9e33 100644 --- a/src/Lumina.Excel/GeneratedSheets/GFateClimbing2.cs +++ b/src/Lumina.Excel/GeneratedSheets/GFateClimbing2.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GFateClimbing2", columnHash: 0xdbf43666 )] - public class GFateClimbing2 : IExcelRow + public class GFateClimbing2 : ExcelRow { - public uint ContentEntry; + public uint ContentEntry { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); ContentEntry = parser.ReadColumn< uint >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/GFateClimbing2Content.cs b/src/Lumina.Excel/GeneratedSheets/GFateClimbing2Content.cs index eb93681a..512bd908 100644 --- a/src/Lumina.Excel/GeneratedSheets/GFateClimbing2Content.cs +++ b/src/Lumina.Excel/GeneratedSheets/GFateClimbing2Content.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GFateClimbing2Content", columnHash: 0xdbf43666 )] - public class GFateClimbing2Content : IExcelRow + public class GFateClimbing2Content : ExcelRow { - public LazyRow< PublicContentTextData > PublicContentTextData; + public LazyRow< PublicContentTextData > PublicContentTextData { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - PublicContentTextData = new LazyRow< PublicContentTextData >( lumina, parser.ReadColumn< uint >( 0 ), language ); + PublicContentTextData = new LazyRow< PublicContentTextData >( gameData, parser.ReadColumn< uint >( 0 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/GFateClimbing2TotemType.cs b/src/Lumina.Excel/GeneratedSheets/GFateClimbing2TotemType.cs index 0a8c52a4..697a7111 100644 --- a/src/Lumina.Excel/GeneratedSheets/GFateClimbing2TotemType.cs +++ b/src/Lumina.Excel/GeneratedSheets/GFateClimbing2TotemType.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GFateClimbing2TotemType", columnHash: 0xdbf43666 )] - public class GFateClimbing2TotemType : IExcelRow + public class GFateClimbing2TotemType : ExcelRow { - public LazyRow< PublicContentTextData > PublicContentTextData; + public LazyRow< PublicContentTextData > PublicContentTextData { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - PublicContentTextData = new LazyRow< PublicContentTextData >( lumina, parser.ReadColumn< uint >( 0 ), language ); + PublicContentTextData = new LazyRow< PublicContentTextData >( gameData, parser.ReadColumn< uint >( 0 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/GFateRideShooting.cs b/src/Lumina.Excel/GeneratedSheets/GFateRideShooting.cs index 3eebd15c..a30cd159 100644 --- a/src/Lumina.Excel/GeneratedSheets/GFateRideShooting.cs +++ b/src/Lumina.Excel/GeneratedSheets/GFateRideShooting.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GFateRideShooting", columnHash: 0xdbf43666 )] - public class GFateRideShooting : IExcelRow + public class GFateRideShooting : ExcelRow { - public uint ContentEntry; + public uint ContentEntry { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); ContentEntry = parser.ReadColumn< uint >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/GardeningSeed.cs b/src/Lumina.Excel/GeneratedSheets/GardeningSeed.cs index 503009bb..5d191e82 100644 --- a/src/Lumina.Excel/GeneratedSheets/GardeningSeed.cs +++ b/src/Lumina.Excel/GeneratedSheets/GardeningSeed.cs @@ -7,25 +7,21 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GardeningSeed", columnHash: 0xa8a6cb9c )] - public class GardeningSeed : IExcelRow + public class GardeningSeed : ExcelRow { - public LazyRow< Item > Item; - public ushort ModelID; - public uint Icon; - public bool SE; - public bool Unknown4; - public byte Unknown5; + public LazyRow< Item > Item { get; set; } + public ushort ModelID { get; set; } + public uint Icon { get; set; } + public bool SE { get; set; } + public bool Unknown4 { get; set; } + public byte Unknown5 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Item = new LazyRow< Item >( lumina, parser.ReadColumn< uint >( 0 ), language ); + Item = new LazyRow< Item >( gameData, parser.ReadColumn< uint >( 0 ), language ); ModelID = parser.ReadColumn< ushort >( 1 ); Icon = parser.ReadColumn< uint >( 2 ); SE = parser.ReadColumn< bool >( 3 ); diff --git a/src/Lumina.Excel/GeneratedSheets/GatheringCondition.cs b/src/Lumina.Excel/GeneratedSheets/GatheringCondition.cs index faa6e81a..bd763d41 100644 --- a/src/Lumina.Excel/GeneratedSheets/GatheringCondition.cs +++ b/src/Lumina.Excel/GeneratedSheets/GatheringCondition.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GatheringCondition", columnHash: 0xdebb20e3 )] - public class GatheringCondition : IExcelRow + public class GatheringCondition : ExcelRow { - public SeString Text; + public SeString Text { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Text = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/GatheringExp.cs b/src/Lumina.Excel/GeneratedSheets/GatheringExp.cs index 70d324ec..1c4b38b7 100644 --- a/src/Lumina.Excel/GeneratedSheets/GatheringExp.cs +++ b/src/Lumina.Excel/GeneratedSheets/GatheringExp.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GatheringExp", columnHash: 0xda365c51 )] - public class GatheringExp : IExcelRow + public class GatheringExp : ExcelRow { - public int Exp; + public int Exp { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Exp = parser.ReadColumn< int >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/GatheringItem.cs b/src/Lumina.Excel/GeneratedSheets/GatheringItem.cs index 5f74b452..03cdf250 100644 --- a/src/Lumina.Excel/GeneratedSheets/GatheringItem.cs +++ b/src/Lumina.Excel/GeneratedSheets/GatheringItem.cs @@ -7,28 +7,24 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GatheringItem", columnHash: 0x032ca4ae )] - public class GatheringItem : IExcelRow + public class GatheringItem : ExcelRow { - public int Item; - public LazyRow< GatheringItemLevelConvertTable > GatheringItemLevel; - public bool Unknown2; - public uint IsHidden; - public bool Unknown4; + public int Item { get; set; } + public LazyRow< GatheringItemLevelConvertTable > GatheringItemLevel { get; set; } + public bool Unknown2 { get; set; } + public uint Unknown3 { get; set; } + public bool IsHidden { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Item = parser.ReadColumn< int >( 0 ); - GatheringItemLevel = new LazyRow< GatheringItemLevelConvertTable >( lumina, parser.ReadColumn< ushort >( 1 ), language ); + GatheringItemLevel = new LazyRow< GatheringItemLevelConvertTable >( gameData, parser.ReadColumn< ushort >( 1 ), language ); Unknown2 = parser.ReadColumn< bool >( 2 ); - IsHidden = parser.ReadColumn< uint >( 3 ); - Unknown4 = parser.ReadColumn< bool >( 4 ); + Unknown3 = parser.ReadColumn< uint >( 3 ); + IsHidden = parser.ReadColumn< bool >( 4 ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/GatheringItemLevelConvertTable.cs b/src/Lumina.Excel/GeneratedSheets/GatheringItemLevelConvertTable.cs index d4700d02..0cc6c844 100644 --- a/src/Lumina.Excel/GeneratedSheets/GatheringItemLevelConvertTable.cs +++ b/src/Lumina.Excel/GeneratedSheets/GatheringItemLevelConvertTable.cs @@ -7,19 +7,15 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GatheringItemLevelConvertTable", columnHash: 0xde74b4c4 )] - public class GatheringItemLevelConvertTable : IExcelRow + public class GatheringItemLevelConvertTable : ExcelRow { - public byte GatheringItemLevel; - public byte Stars; + public byte GatheringItemLevel { get; set; } + public byte Stars { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); GatheringItemLevel = parser.ReadColumn< byte >( 0 ); Stars = parser.ReadColumn< byte >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/GatheringItemPoint.cs b/src/Lumina.Excel/GeneratedSheets/GatheringItemPoint.cs index 7374ac9e..d4a223b2 100644 --- a/src/Lumina.Excel/GeneratedSheets/GatheringItemPoint.cs +++ b/src/Lumina.Excel/GeneratedSheets/GatheringItemPoint.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GatheringItemPoint", columnHash: 0xdbf43666 )] - public class GatheringItemPoint : IExcelRow + public class GatheringItemPoint : ExcelRow { - public LazyRow< GatheringPoint > GatheringPoint; + public LazyRow< GatheringPoint > GatheringPoint { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - GatheringPoint = new LazyRow< GatheringPoint >( lumina, parser.ReadColumn< uint >( 0 ), language ); + GatheringPoint = new LazyRow< GatheringPoint >( gameData, parser.ReadColumn< uint >( 0 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/GatheringLeve.cs b/src/Lumina.Excel/GeneratedSheets/GatheringLeve.cs index f248b63d..cd76612c 100644 --- a/src/Lumina.Excel/GeneratedSheets/GatheringLeve.cs +++ b/src/Lumina.Excel/GeneratedSheets/GatheringLeve.cs @@ -7,47 +7,43 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GatheringLeve", columnHash: 0xfa74e4d0 )] - public class GatheringLeve : IExcelRow + public class GatheringLeve : ExcelRow { - public LazyRow< GatheringLeveRoute >[] Route; - public LazyRow< EventItem > RequiredItem0; - public byte RequiredItemQty0; - public LazyRow< EventItem > RequiredItem1; - public byte RequiredItemQty1; - public LazyRow< EventItem > RequiredItem2; - public byte RequiredItemQty2; - public LazyRow< EventItem > RequiredItem3; - public byte RequiredItemQty3; - public byte ItemNumber; - public LazyRow< GatheringLeveRule > Rule; - public byte Varient; - public ushort Objective0; - public ushort Objective1; - public int BNpcEntry; - public bool UseSecondaryTool; + public LazyRow< GatheringLeveRoute >[] Route { get; set; } + public LazyRow< EventItem > RequiredItem0 { get; set; } + public byte RequiredItemQty0 { get; set; } + public LazyRow< EventItem > RequiredItem1 { get; set; } + public byte RequiredItemQty1 { get; set; } + public LazyRow< EventItem > RequiredItem2 { get; set; } + public byte RequiredItemQty2 { get; set; } + public LazyRow< EventItem > RequiredItem3 { get; set; } + public byte RequiredItemQty3 { get; set; } + public byte ItemNumber { get; set; } + public LazyRow< GatheringLeveRule > Rule { get; set; } + public byte Varient { get; set; } + public ushort Objective0 { get; set; } + public ushort Objective1 { get; set; } + public int BNpcEntry { get; set; } + public bool UseSecondaryTool { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Route = new LazyRow< GatheringLeveRoute >[ 4 ]; for( var i = 0; i < 4; i++ ) - Route[ i ] = new LazyRow< GatheringLeveRoute >( lumina, parser.ReadColumn< int >( 0 + i ), language ); - RequiredItem0 = new LazyRow< EventItem >( lumina, parser.ReadColumn< int >( 4 ), language ); + Route[ i ] = new LazyRow< GatheringLeveRoute >( gameData, parser.ReadColumn< int >( 0 + i ), language ); + RequiredItem0 = new LazyRow< EventItem >( gameData, parser.ReadColumn< int >( 4 ), language ); RequiredItemQty0 = parser.ReadColumn< byte >( 5 ); - RequiredItem1 = new LazyRow< EventItem >( lumina, parser.ReadColumn< int >( 6 ), language ); + RequiredItem1 = new LazyRow< EventItem >( gameData, parser.ReadColumn< int >( 6 ), language ); RequiredItemQty1 = parser.ReadColumn< byte >( 7 ); - RequiredItem2 = new LazyRow< EventItem >( lumina, parser.ReadColumn< int >( 8 ), language ); + RequiredItem2 = new LazyRow< EventItem >( gameData, parser.ReadColumn< int >( 8 ), language ); RequiredItemQty2 = parser.ReadColumn< byte >( 9 ); - RequiredItem3 = new LazyRow< EventItem >( lumina, parser.ReadColumn< int >( 10 ), language ); + RequiredItem3 = new LazyRow< EventItem >( gameData, parser.ReadColumn< int >( 10 ), language ); RequiredItemQty3 = parser.ReadColumn< byte >( 11 ); ItemNumber = parser.ReadColumn< byte >( 12 ); - Rule = new LazyRow< GatheringLeveRule >( lumina, parser.ReadColumn< int >( 13 ), language ); + Rule = new LazyRow< GatheringLeveRule >( gameData, parser.ReadColumn< int >( 13 ), language ); Varient = parser.ReadColumn< byte >( 14 ); Objective0 = parser.ReadColumn< ushort >( 15 ); Objective1 = parser.ReadColumn< ushort >( 16 ); diff --git a/src/Lumina.Excel/GeneratedSheets/GatheringLeveRoute.cs b/src/Lumina.Excel/GeneratedSheets/GatheringLeveRoute.cs index 8d3c5cd1..05549dc1 100644 --- a/src/Lumina.Excel/GeneratedSheets/GatheringLeveRoute.cs +++ b/src/Lumina.Excel/GeneratedSheets/GatheringLeveRoute.cs @@ -7,7 +7,7 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GatheringLeveRoute", columnHash: 0xf20ec1e1 )] - public class GatheringLeveRoute : IExcelRow + public class GatheringLeveRoute : ExcelRow { public struct UnkStruct0Struct { @@ -15,15 +15,11 @@ public struct UnkStruct0Struct public int PopRange; } - public UnkStruct0Struct[] UnkStruct0; + public UnkStruct0Struct[] UnkStruct0 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); UnkStruct0 = new UnkStruct0Struct[ 12 ]; for( var i = 0; i < 12; i++ ) diff --git a/src/Lumina.Excel/GeneratedSheets/GatheringLeveRule.cs b/src/Lumina.Excel/GeneratedSheets/GatheringLeveRule.cs index 71c783b7..cb45cb12 100644 --- a/src/Lumina.Excel/GeneratedSheets/GatheringLeveRule.cs +++ b/src/Lumina.Excel/GeneratedSheets/GatheringLeveRule.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GatheringLeveRule", columnHash: 0xdebb20e3 )] - public class GatheringLeveRule : IExcelRow + public class GatheringLeveRule : ExcelRow { - public SeString Rule; + public SeString Rule { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Rule = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/GatheringNotebookList.cs b/src/Lumina.Excel/GeneratedSheets/GatheringNotebookList.cs index 5e7a3ea1..b040c0dc 100644 --- a/src/Lumina.Excel/GeneratedSheets/GatheringNotebookList.cs +++ b/src/Lumina.Excel/GeneratedSheets/GatheringNotebookList.cs @@ -7,24 +7,20 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GatheringNotebookList", columnHash: 0x1da7bb26 )] - public class GatheringNotebookList : IExcelRow + public class GatheringNotebookList : ExcelRow { - public byte Unknown0; - public LazyRow< GatheringItem >[] GatheringItem; + public byte Unknown0 { get; set; } + public LazyRow< GatheringItem >[] GatheringItem { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< byte >( 0 ); GatheringItem = new LazyRow< GatheringItem >[ 100 ]; for( var i = 0; i < 100; i++ ) - GatheringItem[ i ] = new LazyRow< GatheringItem >( lumina, parser.ReadColumn< int >( 1 + i ), language ); + GatheringItem[ i ] = new LazyRow< GatheringItem >( gameData, parser.ReadColumn< int >( 1 + i ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/GatheringPoint.cs b/src/Lumina.Excel/GeneratedSheets/GatheringPoint.cs index 161f580f..904ba50f 100644 --- a/src/Lumina.Excel/GeneratedSheets/GatheringPoint.cs +++ b/src/Lumina.Excel/GeneratedSheets/GatheringPoint.cs @@ -7,34 +7,30 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GatheringPoint", columnHash: 0x4f531171 )] - public class GatheringPoint : IExcelRow + public class GatheringPoint : ExcelRow { - public byte Type; - public LazyRow< GatheringPointBase > GatheringPointBase; - public byte Count; - public LazyRow< GatheringPointBonus >[] GatheringPointBonus; - public LazyRow< TerritoryType > TerritoryType; - public LazyRow< PlaceName > PlaceName; - public LazyRow< GatheringSubCategory > GatheringSubCategory; + public byte Type { get; set; } + public LazyRow< GatheringPointBase > GatheringPointBase { get; set; } + public byte Count { get; set; } + public LazyRow< GatheringPointBonus >[] GatheringPointBonus { get; set; } + public LazyRow< TerritoryType > TerritoryType { get; set; } + public LazyRow< PlaceName > PlaceName { get; set; } + public LazyRow< GatheringSubCategory > GatheringSubCategory { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Type = parser.ReadColumn< byte >( 0 ); - GatheringPointBase = new LazyRow< GatheringPointBase >( lumina, parser.ReadColumn< int >( 1 ), language ); + GatheringPointBase = new LazyRow< GatheringPointBase >( gameData, parser.ReadColumn< int >( 1 ), language ); Count = parser.ReadColumn< byte >( 2 ); GatheringPointBonus = new LazyRow< GatheringPointBonus >[ 2 ]; for( var i = 0; i < 2; i++ ) - GatheringPointBonus[ i ] = new LazyRow< GatheringPointBonus >( lumina, parser.ReadColumn< ushort >( 3 + i ), language ); - TerritoryType = new LazyRow< TerritoryType >( lumina, parser.ReadColumn< ushort >( 5 ), language ); - PlaceName = new LazyRow< PlaceName >( lumina, parser.ReadColumn< ushort >( 6 ), language ); - GatheringSubCategory = new LazyRow< GatheringSubCategory >( lumina, parser.ReadColumn< ushort >( 7 ), language ); + GatheringPointBonus[ i ] = new LazyRow< GatheringPointBonus >( gameData, parser.ReadColumn< ushort >( 3 + i ), language ); + TerritoryType = new LazyRow< TerritoryType >( gameData, parser.ReadColumn< ushort >( 5 ), language ); + PlaceName = new LazyRow< PlaceName >( gameData, parser.ReadColumn< ushort >( 6 ), language ); + GatheringSubCategory = new LazyRow< GatheringSubCategory >( gameData, parser.ReadColumn< ushort >( 7 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/GatheringPointBase.cs b/src/Lumina.Excel/GeneratedSheets/GatheringPointBase.cs index 973d06da..d23d204d 100644 --- a/src/Lumina.Excel/GeneratedSheets/GatheringPointBase.cs +++ b/src/Lumina.Excel/GeneratedSheets/GatheringPointBase.cs @@ -7,23 +7,19 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GatheringPointBase", columnHash: 0x73fa0924 )] - public class GatheringPointBase : IExcelRow + public class GatheringPointBase : ExcelRow { - public LazyRow< GatheringType > GatheringType; - public byte GatheringLevel; - public int[] Item; - public bool IsLimited; + public LazyRow< GatheringType > GatheringType { get; set; } + public byte GatheringLevel { get; set; } + public int[] Item { get; set; } + public bool IsLimited { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - GatheringType = new LazyRow< GatheringType >( lumina, parser.ReadColumn< int >( 0 ), language ); + GatheringType = new LazyRow< GatheringType >( gameData, parser.ReadColumn< int >( 0 ), language ); GatheringLevel = parser.ReadColumn< byte >( 1 ); Item = new int[ 8 ]; for( var i = 0; i < 8; i++ ) diff --git a/src/Lumina.Excel/GeneratedSheets/GatheringPointBonus.cs b/src/Lumina.Excel/GeneratedSheets/GatheringPointBonus.cs index e71101a6..1efd45b6 100644 --- a/src/Lumina.Excel/GeneratedSheets/GatheringPointBonus.cs +++ b/src/Lumina.Excel/GeneratedSheets/GatheringPointBonus.cs @@ -7,30 +7,26 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GatheringPointBonus", columnHash: 0xcd832c29 )] - public class GatheringPointBonus : IExcelRow + public class GatheringPointBonus : ExcelRow { - public LazyRow< GatheringCondition > Condition; - public uint ConditionValue; - public ushort Unknown2; - public LazyRow< GatheringPointBonusType > BonusType; - public ushort BonusValue; - public ushort Unknown5; - public bool Unknown53; - public uint Unknown54; + public LazyRow< GatheringCondition > Condition { get; set; } + public uint ConditionValue { get; set; } + public ushort Unknown2 { get; set; } + public LazyRow< GatheringPointBonusType > BonusType { get; set; } + public ushort BonusValue { get; set; } + public ushort Unknown5 { get; set; } + public bool Unknown53 { get; set; } + public uint Unknown54 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Condition = new LazyRow< GatheringCondition >( lumina, parser.ReadColumn< byte >( 0 ), language ); + Condition = new LazyRow< GatheringCondition >( gameData, parser.ReadColumn< byte >( 0 ), language ); ConditionValue = parser.ReadColumn< uint >( 1 ); Unknown2 = parser.ReadColumn< ushort >( 2 ); - BonusType = new LazyRow< GatheringPointBonusType >( lumina, parser.ReadColumn< byte >( 3 ), language ); + BonusType = new LazyRow< GatheringPointBonusType >( gameData, parser.ReadColumn< byte >( 3 ), language ); BonusValue = parser.ReadColumn< ushort >( 4 ); Unknown5 = parser.ReadColumn< ushort >( 5 ); Unknown53 = parser.ReadColumn< bool >( 6 ); diff --git a/src/Lumina.Excel/GeneratedSheets/GatheringPointBonusType.cs b/src/Lumina.Excel/GeneratedSheets/GatheringPointBonusType.cs index 9d4fb4e9..74ac5164 100644 --- a/src/Lumina.Excel/GeneratedSheets/GatheringPointBonusType.cs +++ b/src/Lumina.Excel/GeneratedSheets/GatheringPointBonusType.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GatheringPointBonusType", columnHash: 0xdebb20e3 )] - public class GatheringPointBonusType : IExcelRow + public class GatheringPointBonusType : ExcelRow { - public SeString Text; + public SeString Text { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Text = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/GatheringPointName.cs b/src/Lumina.Excel/GeneratedSheets/GatheringPointName.cs index 2b4e0c60..bc286e3c 100644 --- a/src/Lumina.Excel/GeneratedSheets/GatheringPointName.cs +++ b/src/Lumina.Excel/GeneratedSheets/GatheringPointName.cs @@ -7,25 +7,21 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GatheringPointName", columnHash: 0x77a72da0 )] - public class GatheringPointName : IExcelRow + public class GatheringPointName : ExcelRow { - public SeString Singular; - public sbyte Adjective; - public SeString Plural; - public sbyte PossessivePronoun; - public sbyte StartsWithVowel; - public sbyte Unknown5; - public sbyte Pronoun; - public sbyte Article; + public SeString Singular { get; set; } + public sbyte Adjective { get; set; } + public SeString Plural { get; set; } + public sbyte PossessivePronoun { get; set; } + public sbyte StartsWithVowel { get; set; } + public sbyte Unknown5 { get; set; } + public sbyte Pronoun { get; set; } + public sbyte Article { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Singular = parser.ReadColumn< SeString >( 0 ); Adjective = parser.ReadColumn< sbyte >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/GatheringPointTransient.cs b/src/Lumina.Excel/GeneratedSheets/GatheringPointTransient.cs index c5b4d0af..d317c559 100644 --- a/src/Lumina.Excel/GeneratedSheets/GatheringPointTransient.cs +++ b/src/Lumina.Excel/GeneratedSheets/GatheringPointTransient.cs @@ -7,24 +7,20 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GatheringPointTransient", columnHash: 0x7164626b )] - public class GatheringPointTransient : IExcelRow + public class GatheringPointTransient : ExcelRow { - public ushort EphemeralStartTime; - public ushort EphemeralEndTime; - public LazyRow< GatheringRarePopTimeTable > GatheringRarePopTimeTable; + public ushort EphemeralStartTime { get; set; } + public ushort EphemeralEndTime { get; set; } + public LazyRow< GatheringRarePopTimeTable > GatheringRarePopTimeTable { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); EphemeralStartTime = parser.ReadColumn< ushort >( 0 ); EphemeralEndTime = parser.ReadColumn< ushort >( 1 ); - GatheringRarePopTimeTable = new LazyRow< GatheringRarePopTimeTable >( lumina, parser.ReadColumn< int >( 2 ), language ); + GatheringRarePopTimeTable = new LazyRow< GatheringRarePopTimeTable >( gameData, parser.ReadColumn< int >( 2 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/GatheringRarePopTimeTable.cs b/src/Lumina.Excel/GeneratedSheets/GatheringRarePopTimeTable.cs index 18cebe49..1a9b0272 100644 --- a/src/Lumina.Excel/GeneratedSheets/GatheringRarePopTimeTable.cs +++ b/src/Lumina.Excel/GeneratedSheets/GatheringRarePopTimeTable.cs @@ -7,7 +7,7 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GatheringRarePopTimeTable", columnHash: 0x865de322 )] - public class GatheringRarePopTimeTable : IExcelRow + public class GatheringRarePopTimeTable : ExcelRow { public struct UnkStruct0Struct { @@ -15,15 +15,11 @@ public struct UnkStruct0Struct public ushort Durationm; } - public UnkStruct0Struct[] UnkStruct0; + public UnkStruct0Struct[] UnkStruct0 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); UnkStruct0 = new UnkStruct0Struct[ 3 ]; for( var i = 0; i < 3; i++ ) diff --git a/src/Lumina.Excel/GeneratedSheets/GatheringSubCategory.cs b/src/Lumina.Excel/GeneratedSheets/GatheringSubCategory.cs index 4ab8a3c7..5171785f 100644 --- a/src/Lumina.Excel/GeneratedSheets/GatheringSubCategory.cs +++ b/src/Lumina.Excel/GeneratedSheets/GatheringSubCategory.cs @@ -7,30 +7,26 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GatheringSubCategory", columnHash: 0x6dac8145 )] - public class GatheringSubCategory : IExcelRow + public class GatheringSubCategory : ExcelRow { - public LazyRow< GatheringType > GatheringType; - public LazyRow< ClassJob > ClassJob; - public uint Unknown2; - public ushort Division; - public LazyRow< Item > Item; - public SeString FolkloreBook; - public byte Unknown6; + public LazyRow< GatheringType > GatheringType { get; set; } + public LazyRow< ClassJob > ClassJob { get; set; } + public uint Unknown2 { get; set; } + public ushort Division { get; set; } + public LazyRow< Item > Item { get; set; } + public SeString FolkloreBook { get; set; } + public byte Unknown6 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - GatheringType = new LazyRow< GatheringType >( lumina, parser.ReadColumn< byte >( 0 ), language ); - ClassJob = new LazyRow< ClassJob >( lumina, parser.ReadColumn< byte >( 1 ), language ); + GatheringType = new LazyRow< GatheringType >( gameData, parser.ReadColumn< byte >( 0 ), language ); + ClassJob = new LazyRow< ClassJob >( gameData, parser.ReadColumn< byte >( 1 ), language ); Unknown2 = parser.ReadColumn< uint >( 2 ); Division = parser.ReadColumn< ushort >( 3 ); - Item = new LazyRow< Item >( lumina, parser.ReadColumn< int >( 4 ), language ); + Item = new LazyRow< Item >( gameData, parser.ReadColumn< int >( 4 ), language ); FolkloreBook = parser.ReadColumn< SeString >( 5 ); Unknown6 = parser.ReadColumn< byte >( 6 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/GatheringType.cs b/src/Lumina.Excel/GeneratedSheets/GatheringType.cs index 747deecc..e0221ecb 100644 --- a/src/Lumina.Excel/GeneratedSheets/GatheringType.cs +++ b/src/Lumina.Excel/GeneratedSheets/GatheringType.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GatheringType", columnHash: 0x182c5eea )] - public class GatheringType : IExcelRow + public class GatheringType : ExcelRow { - public SeString Name; - public int IconMain; - public int IconOff; + public SeString Name { get; set; } + public int IconMain { get; set; } + public int IconOff { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); IconMain = parser.ReadColumn< int >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/GcArmyCaptureTactics.cs b/src/Lumina.Excel/GeneratedSheets/GcArmyCaptureTactics.cs index 6fc1a243..986eafa5 100644 --- a/src/Lumina.Excel/GeneratedSheets/GcArmyCaptureTactics.cs +++ b/src/Lumina.Excel/GeneratedSheets/GcArmyCaptureTactics.cs @@ -7,29 +7,25 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GcArmyCaptureTactics", columnHash: 0x62bcfbad )] - public class GcArmyCaptureTactics : IExcelRow + public class GcArmyCaptureTactics : ExcelRow { - public LazyRow< Status > Name; - public byte HP; - public byte DamageDealt; - public byte DamageReceived; - public LazyRow< Addon > Tactic; - public uint Icon; + public LazyRow< Status > Name { get; set; } + public byte HP { get; set; } + public byte DamageDealt { get; set; } + public byte DamageReceived { get; set; } + public LazyRow< Addon > Tactic { get; set; } + public uint Icon { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Name = new LazyRow< Status >( lumina, parser.ReadColumn< int >( 0 ), language ); + Name = new LazyRow< Status >( gameData, parser.ReadColumn< int >( 0 ), language ); HP = parser.ReadColumn< byte >( 1 ); DamageDealt = parser.ReadColumn< byte >( 2 ); DamageReceived = parser.ReadColumn< byte >( 3 ); - Tactic = new LazyRow< Addon >( lumina, parser.ReadColumn< uint >( 4 ), language ); + Tactic = new LazyRow< Addon >( gameData, parser.ReadColumn< uint >( 4 ), language ); Icon = parser.ReadColumn< uint >( 5 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/GcArmyExpedition.cs b/src/Lumina.Excel/GeneratedSheets/GcArmyExpedition.cs index e9611e25..4891b672 100644 --- a/src/Lumina.Excel/GeneratedSheets/GcArmyExpedition.cs +++ b/src/Lumina.Excel/GeneratedSheets/GcArmyExpedition.cs @@ -7,7 +7,7 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GcArmyExpedition", columnHash: 0x852cc288 )] - public class GcArmyExpedition : IExcelRow + public class GcArmyExpedition : ExcelRow { public struct UnkStruct10Struct { @@ -46,33 +46,29 @@ public struct UnkStruct58Struct public byte PercentAllMet; } - public byte RequiredFlag; - public byte UnlockFlag; - public byte RequiredLevel; - public ushort RequiredSeals; - public uint RewardExperience; - public byte PercentBase; - public byte Unknown6; - public LazyRow< GcArmyExpeditionType > GcArmyExpeditionType; - public SeString Name; - public SeString Description; - public UnkStruct10Struct[] UnkStruct10; - public UnkStruct16Struct[] UnkStruct16; - public UnkStruct22Struct[] UnkStruct22; - public UnkStruct28Struct[] UnkStruct28; - public UnkStruct34Struct[] UnkStruct34; - public UnkStruct40Struct[] UnkStruct40; - public UnkStruct46Struct[] UnkStruct46; - public UnkStruct52Struct[] UnkStruct52; - public UnkStruct58Struct[] UnkStruct58; + public byte RequiredFlag { get; set; } + public byte UnlockFlag { get; set; } + public byte RequiredLevel { get; set; } + public ushort RequiredSeals { get; set; } + public uint RewardExperience { get; set; } + public byte PercentBase { get; set; } + public byte Unknown6 { get; set; } + public LazyRow< GcArmyExpeditionType > GcArmyExpeditionType { get; set; } + public SeString Name { get; set; } + public SeString Description { get; set; } + public UnkStruct10Struct[] UnkStruct10 { get; set; } + public UnkStruct16Struct[] UnkStruct16 { get; set; } + public UnkStruct22Struct[] UnkStruct22 { get; set; } + public UnkStruct28Struct[] UnkStruct28 { get; set; } + public UnkStruct34Struct[] UnkStruct34 { get; set; } + public UnkStruct40Struct[] UnkStruct40 { get; set; } + public UnkStruct46Struct[] UnkStruct46 { get; set; } + public UnkStruct52Struct[] UnkStruct52 { get; set; } + public UnkStruct58Struct[] UnkStruct58 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); RequiredFlag = parser.ReadColumn< byte >( 0 ); UnlockFlag = parser.ReadColumn< byte >( 1 ); @@ -81,7 +77,7 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) RewardExperience = parser.ReadColumn< uint >( 4 ); PercentBase = parser.ReadColumn< byte >( 5 ); Unknown6 = parser.ReadColumn< byte >( 6 ); - GcArmyExpeditionType = new LazyRow< GcArmyExpeditionType >( lumina, parser.ReadColumn< byte >( 7 ), language ); + GcArmyExpeditionType = new LazyRow< GcArmyExpeditionType >( gameData, parser.ReadColumn< byte >( 7 ), language ); Name = parser.ReadColumn< SeString >( 8 ); Description = parser.ReadColumn< SeString >( 9 ); UnkStruct10 = new UnkStruct10Struct[ 6 ]; diff --git a/src/Lumina.Excel/GeneratedSheets/GcArmyExpeditionMemberBonus.cs b/src/Lumina.Excel/GeneratedSheets/GcArmyExpeditionMemberBonus.cs index 4f6d6fb8..a5552623 100644 --- a/src/Lumina.Excel/GeneratedSheets/GcArmyExpeditionMemberBonus.cs +++ b/src/Lumina.Excel/GeneratedSheets/GcArmyExpeditionMemberBonus.cs @@ -7,22 +7,18 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GcArmyExpeditionMemberBonus", columnHash: 0xde74b4c4 )] - public class GcArmyExpeditionMemberBonus : IExcelRow + public class GcArmyExpeditionMemberBonus : ExcelRow { - public LazyRow< Race > Race; - public LazyRow< ClassJob > ClassJob; + public LazyRow< Race > Race { get; set; } + public LazyRow< ClassJob > ClassJob { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Race = new LazyRow< Race >( lumina, parser.ReadColumn< byte >( 0 ), language ); - ClassJob = new LazyRow< ClassJob >( lumina, parser.ReadColumn< byte >( 1 ), language ); + Race = new LazyRow< Race >( gameData, parser.ReadColumn< byte >( 0 ), language ); + ClassJob = new LazyRow< ClassJob >( gameData, parser.ReadColumn< byte >( 1 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/GcArmyExpeditionType.cs b/src/Lumina.Excel/GeneratedSheets/GcArmyExpeditionType.cs index 8a4d0014..01f2a530 100644 --- a/src/Lumina.Excel/GeneratedSheets/GcArmyExpeditionType.cs +++ b/src/Lumina.Excel/GeneratedSheets/GcArmyExpeditionType.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GcArmyExpeditionType", columnHash: 0xdebb20e3 )] - public class GcArmyExpeditionType : IExcelRow + public class GcArmyExpeditionType : ExcelRow { - public SeString Name; + public SeString Name { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/GcArmyMemberGrow.cs b/src/Lumina.Excel/GeneratedSheets/GcArmyMemberGrow.cs index d066f614..54fe1279 100644 --- a/src/Lumina.Excel/GeneratedSheets/GcArmyMemberGrow.cs +++ b/src/Lumina.Excel/GeneratedSheets/GcArmyMemberGrow.cs @@ -7,266 +7,262 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GcArmyMemberGrow", columnHash: 0xaf66261c )] - public class GcArmyMemberGrow : IExcelRow + public class GcArmyMemberGrow : ExcelRow { - public LazyRow< ClassJob > ClassJob; - public LazyRow< Item > ClassBook; - public ushort Unknown2; - public ushort Unknown3; - public ushort Unknown4; - public ushort Unknown5; - public ushort Unknown6; - public ushort Unknown7; - public ushort Unknown8; - public ushort Unknown9; - public ushort Unknown10; - public ushort Unknown11; - public ushort Unknown12; - public ushort Unknown13; - public ushort Unknown14; - public ushort Unknown15; - public ushort Unknown16; - public ushort Unknown17; - public ushort Unknown18; - public ushort Unknown19; - public ushort Unknown20; - public ushort Unknown21; - public ushort Unknown22; - public ushort Unknown23; - public ushort Unknown24; - public ushort Unknown25; - public ushort Unknown26; - public ushort Unknown27; - public ushort Unknown28; - public ushort Unknown29; - public ushort Unknown30; - public ushort Unknown31; - public ushort Unknown32; - public ushort Unknown33; - public ushort Unknown34; - public ushort Unknown35; - public ushort Unknown36; - public ushort Unknown37; - public ushort Unknown38; - public ushort Unknown39; - public ushort Unknown40; - public ushort Unknown41; - public ushort Unknown42; - public ushort Unknown43; - public ushort Unknown44; - public ushort Unknown45; - public ushort Unknown46; - public ushort Unknown47; - public ushort Unknown48; - public ushort Unknown49; - public ushort Unknown50; - public ushort Unknown51; - public ushort Unknown52; - public ushort Unknown53; - public ushort Unknown54; - public ushort Unknown55; - public ushort Unknown56; - public ushort Unknown57; - public ushort Unknown58; - public ushort Unknown59; - public ushort Unknown60; - public ushort Unknown61; - public ushort Unknown62; - public byte Unknown63; - public byte Unknown64; - public byte Unknown65; - public byte Unknown66; - public byte Unknown67; - public byte Unknown68; - public byte Unknown69; - public byte Unknown70; - public byte Unknown71; - public byte Unknown72; - public byte Unknown73; - public byte Unknown74; - public byte Unknown75; - public byte Unknown76; - public byte Unknown77; - public byte Unknown78; - public byte Unknown79; - public byte Unknown80; - public byte Unknown81; - public byte Unknown82; - public byte Unknown83; - public byte Unknown84; - public byte Unknown85; - public byte Unknown86; - public byte Unknown87; - public byte Unknown88; - public byte Unknown89; - public byte Unknown90; - public byte Unknown91; - public byte Unknown92; - public byte Unknown93; - public byte Unknown94; - public byte Unknown95; - public byte Unknown96; - public byte Unknown97; - public byte Unknown98; - public byte Unknown99; - public byte Unknown100; - public byte Unknown101; - public byte Unknown102; - public byte Unknown103; - public byte Unknown104; - public byte Unknown105; - public byte Unknown106; - public byte Unknown107; - public byte Unknown108; - public byte Unknown109; - public byte Unknown110; - public byte Unknown111; - public byte Unknown112; - public byte Unknown113; - public byte Unknown114; - public byte Unknown115; - public byte Unknown116; - public byte Unknown117; - public byte Unknown118; - public byte Unknown119; - public byte Unknown120; - public byte Unknown121; - public byte Unknown122; - public byte Unknown123; - public byte Unknown124; - public byte Unknown125; - public byte Unknown126; - public byte Unknown127; - public byte Unknown128; - public byte Unknown129; - public byte Unknown130; - public byte Unknown131; - public byte Unknown132; - public byte Unknown133; - public byte Unknown134; - public byte Unknown135; - public byte Unknown136; - public byte Unknown137; - public byte Unknown138; - public byte Unknown139; - public byte Unknown140; - public byte Unknown141; - public byte Unknown142; - public byte Unknown143; - public byte Unknown144; - public byte Unknown145; - public byte Unknown146; - public byte Unknown147; - public byte Unknown148; - public byte Unknown149; - public byte Unknown150; - public byte Unknown151; - public byte Unknown152; - public byte Unknown153; - public byte Unknown154; - public byte Unknown155; - public byte Unknown156; - public byte Unknown157; - public byte Unknown158; - public byte Unknown159; - public byte Unknown160; - public byte Unknown161; - public byte Unknown162; - public byte Unknown163; - public byte Unknown164; - public byte Unknown165; - public byte Unknown166; - public byte Unknown167; - public byte Unknown168; - public byte Unknown169; - public byte Unknown170; - public byte Unknown171; - public byte Unknown172; - public byte Unknown173; - public byte Unknown174; - public byte Unknown175; - public byte Unknown176; - public byte Unknown177; - public byte Unknown178; - public byte Unknown179; - public byte Unknown180; - public byte Unknown181; - public byte Unknown182; - public byte Unknown183; - public byte Unknown184; - public byte Unknown185; - public byte Unknown186; - public byte Unknown187; - public byte Unknown188; - public byte Unknown189; - public byte Unknown190; - public byte Unknown191; - public byte Unknown192; - public byte Unknown193; - public byte Unknown194; - public byte Unknown195; - public byte Unknown196; - public byte Unknown197; - public byte Unknown198; - public byte Unknown199; - public byte Unknown200; - public byte Unknown201; - public byte Unknown202; - public byte Unknown203; - public byte Unknown204; - public byte Unknown205; - public byte Unknown206; - public byte Unknown207; - public byte Unknown208; - public byte Unknown209; - public byte Unknown210; - public byte Unknown211; - public byte Unknown212; - public byte Unknown213; - public byte Unknown214; - public byte Unknown215; - public byte Unknown216; - public byte Unknown217; - public byte Unknown218; - public byte Unknown219; - public byte Unknown220; - public byte Unknown221; - public byte Unknown222; - public byte Unknown223; - public byte Unknown224; - public byte Unknown225; - public byte Unknown226; - public byte Unknown227; - public byte Unknown228; - public byte Unknown229; - public byte Unknown230; - public byte Unknown231; - public byte Unknown232; - public byte Unknown233; - public byte Unknown234; - public byte Unknown235; - public byte Unknown236; - public byte Unknown237; - public byte Unknown238; - public byte Unknown239; - public byte Unknown240; - public byte Unknown241; - public byte Unknown242; - public byte Unknown243; - public byte Unknown244; - public byte Unknown245; + public LazyRow< ClassJob > ClassJob { get; set; } + public LazyRow< Item > ClassBook { get; set; } + public ushort Unknown2 { get; set; } + public ushort Unknown3 { get; set; } + public ushort Unknown4 { get; set; } + public ushort Unknown5 { get; set; } + public ushort Unknown6 { get; set; } + public ushort Unknown7 { get; set; } + public ushort Unknown8 { get; set; } + public ushort Unknown9 { get; set; } + public ushort Unknown10 { get; set; } + public ushort Unknown11 { get; set; } + public ushort Unknown12 { get; set; } + public ushort Unknown13 { get; set; } + public ushort Unknown14 { get; set; } + public ushort Unknown15 { get; set; } + public ushort Unknown16 { get; set; } + public ushort Unknown17 { get; set; } + public ushort Unknown18 { get; set; } + public ushort Unknown19 { get; set; } + public ushort Unknown20 { get; set; } + public ushort Unknown21 { get; set; } + public ushort Unknown22 { get; set; } + public ushort Unknown23 { get; set; } + public ushort Unknown24 { get; set; } + public ushort Unknown25 { get; set; } + public ushort Unknown26 { get; set; } + public ushort Unknown27 { get; set; } + public ushort Unknown28 { get; set; } + public ushort Unknown29 { get; set; } + public ushort Unknown30 { get; set; } + public ushort Unknown31 { get; set; } + public ushort Unknown32 { get; set; } + public ushort Unknown33 { get; set; } + public ushort Unknown34 { get; set; } + public ushort Unknown35 { get; set; } + public ushort Unknown36 { get; set; } + public ushort Unknown37 { get; set; } + public ushort Unknown38 { get; set; } + public ushort Unknown39 { get; set; } + public ushort Unknown40 { get; set; } + public ushort Unknown41 { get; set; } + public ushort Unknown42 { get; set; } + public ushort Unknown43 { get; set; } + public ushort Unknown44 { get; set; } + public ushort Unknown45 { get; set; } + public ushort Unknown46 { get; set; } + public ushort Unknown47 { get; set; } + public ushort Unknown48 { get; set; } + public ushort Unknown49 { get; set; } + public ushort Unknown50 { get; set; } + public ushort Unknown51 { get; set; } + public ushort Unknown52 { get; set; } + public ushort Unknown53 { get; set; } + public ushort Unknown54 { get; set; } + public ushort Unknown55 { get; set; } + public ushort Unknown56 { get; set; } + public ushort Unknown57 { get; set; } + public ushort Unknown58 { get; set; } + public ushort Unknown59 { get; set; } + public ushort Unknown60 { get; set; } + public ushort Unknown61 { get; set; } + public ushort Unknown62 { get; set; } + public byte Unknown63 { get; set; } + public byte Unknown64 { get; set; } + public byte Unknown65 { get; set; } + public byte Unknown66 { get; set; } + public byte Unknown67 { get; set; } + public byte Unknown68 { get; set; } + public byte Unknown69 { get; set; } + public byte Unknown70 { get; set; } + public byte Unknown71 { get; set; } + public byte Unknown72 { get; set; } + public byte Unknown73 { get; set; } + public byte Unknown74 { get; set; } + public byte Unknown75 { get; set; } + public byte Unknown76 { get; set; } + public byte Unknown77 { get; set; } + public byte Unknown78 { get; set; } + public byte Unknown79 { get; set; } + public byte Unknown80 { get; set; } + public byte Unknown81 { get; set; } + public byte Unknown82 { get; set; } + public byte Unknown83 { get; set; } + public byte Unknown84 { get; set; } + public byte Unknown85 { get; set; } + public byte Unknown86 { get; set; } + public byte Unknown87 { get; set; } + public byte Unknown88 { get; set; } + public byte Unknown89 { get; set; } + public byte Unknown90 { get; set; } + public byte Unknown91 { get; set; } + public byte Unknown92 { get; set; } + public byte Unknown93 { get; set; } + public byte Unknown94 { get; set; } + public byte Unknown95 { get; set; } + public byte Unknown96 { get; set; } + public byte Unknown97 { get; set; } + public byte Unknown98 { get; set; } + public byte Unknown99 { get; set; } + public byte Unknown100 { get; set; } + public byte Unknown101 { get; set; } + public byte Unknown102 { get; set; } + public byte Unknown103 { get; set; } + public byte Unknown104 { get; set; } + public byte Unknown105 { get; set; } + public byte Unknown106 { get; set; } + public byte Unknown107 { get; set; } + public byte Unknown108 { get; set; } + public byte Unknown109 { get; set; } + public byte Unknown110 { get; set; } + public byte Unknown111 { get; set; } + public byte Unknown112 { get; set; } + public byte Unknown113 { get; set; } + public byte Unknown114 { get; set; } + public byte Unknown115 { get; set; } + public byte Unknown116 { get; set; } + public byte Unknown117 { get; set; } + public byte Unknown118 { get; set; } + public byte Unknown119 { get; set; } + public byte Unknown120 { get; set; } + public byte Unknown121 { get; set; } + public byte Unknown122 { get; set; } + public byte Unknown123 { get; set; } + public byte Unknown124 { get; set; } + public byte Unknown125 { get; set; } + public byte Unknown126 { get; set; } + public byte Unknown127 { get; set; } + public byte Unknown128 { get; set; } + public byte Unknown129 { get; set; } + public byte Unknown130 { get; set; } + public byte Unknown131 { get; set; } + public byte Unknown132 { get; set; } + public byte Unknown133 { get; set; } + public byte Unknown134 { get; set; } + public byte Unknown135 { get; set; } + public byte Unknown136 { get; set; } + public byte Unknown137 { get; set; } + public byte Unknown138 { get; set; } + public byte Unknown139 { get; set; } + public byte Unknown140 { get; set; } + public byte Unknown141 { get; set; } + public byte Unknown142 { get; set; } + public byte Unknown143 { get; set; } + public byte Unknown144 { get; set; } + public byte Unknown145 { get; set; } + public byte Unknown146 { get; set; } + public byte Unknown147 { get; set; } + public byte Unknown148 { get; set; } + public byte Unknown149 { get; set; } + public byte Unknown150 { get; set; } + public byte Unknown151 { get; set; } + public byte Unknown152 { get; set; } + public byte Unknown153 { get; set; } + public byte Unknown154 { get; set; } + public byte Unknown155 { get; set; } + public byte Unknown156 { get; set; } + public byte Unknown157 { get; set; } + public byte Unknown158 { get; set; } + public byte Unknown159 { get; set; } + public byte Unknown160 { get; set; } + public byte Unknown161 { get; set; } + public byte Unknown162 { get; set; } + public byte Unknown163 { get; set; } + public byte Unknown164 { get; set; } + public byte Unknown165 { get; set; } + public byte Unknown166 { get; set; } + public byte Unknown167 { get; set; } + public byte Unknown168 { get; set; } + public byte Unknown169 { get; set; } + public byte Unknown170 { get; set; } + public byte Unknown171 { get; set; } + public byte Unknown172 { get; set; } + public byte Unknown173 { get; set; } + public byte Unknown174 { get; set; } + public byte Unknown175 { get; set; } + public byte Unknown176 { get; set; } + public byte Unknown177 { get; set; } + public byte Unknown178 { get; set; } + public byte Unknown179 { get; set; } + public byte Unknown180 { get; set; } + public byte Unknown181 { get; set; } + public byte Unknown182 { get; set; } + public byte Unknown183 { get; set; } + public byte Unknown184 { get; set; } + public byte Unknown185 { get; set; } + public byte Unknown186 { get; set; } + public byte Unknown187 { get; set; } + public byte Unknown188 { get; set; } + public byte Unknown189 { get; set; } + public byte Unknown190 { get; set; } + public byte Unknown191 { get; set; } + public byte Unknown192 { get; set; } + public byte Unknown193 { get; set; } + public byte Unknown194 { get; set; } + public byte Unknown195 { get; set; } + public byte Unknown196 { get; set; } + public byte Unknown197 { get; set; } + public byte Unknown198 { get; set; } + public byte Unknown199 { get; set; } + public byte Unknown200 { get; set; } + public byte Unknown201 { get; set; } + public byte Unknown202 { get; set; } + public byte Unknown203 { get; set; } + public byte Unknown204 { get; set; } + public byte Unknown205 { get; set; } + public byte Unknown206 { get; set; } + public byte Unknown207 { get; set; } + public byte Unknown208 { get; set; } + public byte Unknown209 { get; set; } + public byte Unknown210 { get; set; } + public byte Unknown211 { get; set; } + public byte Unknown212 { get; set; } + public byte Unknown213 { get; set; } + public byte Unknown214 { get; set; } + public byte Unknown215 { get; set; } + public byte Unknown216 { get; set; } + public byte Unknown217 { get; set; } + public byte Unknown218 { get; set; } + public byte Unknown219 { get; set; } + public byte Unknown220 { get; set; } + public byte Unknown221 { get; set; } + public byte Unknown222 { get; set; } + public byte Unknown223 { get; set; } + public byte Unknown224 { get; set; } + public byte Unknown225 { get; set; } + public byte Unknown226 { get; set; } + public byte Unknown227 { get; set; } + public byte Unknown228 { get; set; } + public byte Unknown229 { get; set; } + public byte Unknown230 { get; set; } + public byte Unknown231 { get; set; } + public byte Unknown232 { get; set; } + public byte Unknown233 { get; set; } + public byte Unknown234 { get; set; } + public byte Unknown235 { get; set; } + public byte Unknown236 { get; set; } + public byte Unknown237 { get; set; } + public byte Unknown238 { get; set; } + public byte Unknown239 { get; set; } + public byte Unknown240 { get; set; } + public byte Unknown241 { get; set; } + public byte Unknown242 { get; set; } + public byte Unknown243 { get; set; } + public byte Unknown244 { get; set; } + public byte Unknown245 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - ClassJob = new LazyRow< ClassJob >( lumina, parser.ReadColumn< byte >( 0 ), language ); - ClassBook = new LazyRow< Item >( lumina, parser.ReadColumn< int >( 1 ), language ); + ClassJob = new LazyRow< ClassJob >( gameData, parser.ReadColumn< byte >( 0 ), language ); + ClassBook = new LazyRow< Item >( gameData, parser.ReadColumn< int >( 1 ), language ); Unknown2 = parser.ReadColumn< ushort >( 2 ); Unknown3 = parser.ReadColumn< ushort >( 3 ); Unknown4 = parser.ReadColumn< ushort >( 4 ); diff --git a/src/Lumina.Excel/GeneratedSheets/GcArmyTraining.cs b/src/Lumina.Excel/GeneratedSheets/GcArmyTraining.cs index fc653157..a4562dfa 100644 --- a/src/Lumina.Excel/GeneratedSheets/GcArmyTraining.cs +++ b/src/Lumina.Excel/GeneratedSheets/GcArmyTraining.cs @@ -7,23 +7,19 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GcArmyTraining", columnHash: 0x274780bb )] - public class GcArmyTraining : IExcelRow + public class GcArmyTraining : ExcelRow { - public sbyte PhysicalBonus; - public sbyte MentalBonus; - public sbyte TacticalBonus; - public uint Experience; - public SeString Name; - public SeString Description; + public sbyte PhysicalBonus { get; set; } + public sbyte MentalBonus { get; set; } + public sbyte TacticalBonus { get; set; } + public uint Experience { get; set; } + public SeString Name { get; set; } + public SeString Description { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); PhysicalBonus = parser.ReadColumn< sbyte >( 0 ); MentalBonus = parser.ReadColumn< sbyte >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/GeneralAction.cs b/src/Lumina.Excel/GeneratedSheets/GeneralAction.cs index 0170507e..8a631d18 100644 --- a/src/Lumina.Excel/GeneratedSheets/GeneralAction.cs +++ b/src/Lumina.Excel/GeneratedSheets/GeneralAction.cs @@ -7,31 +7,27 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GeneralAction", columnHash: 0x5dffa8fa )] - public class GeneralAction : IExcelRow + public class GeneralAction : ExcelRow { - public SeString Name; - public SeString Description; - public byte Unknown2; - public LazyRow< Action > Action; - public ushort UnlockLink; - public byte Recast; - public byte UIPriority; - public int Icon; - public bool Unknown8; + public SeString Name { get; set; } + public SeString Description { get; set; } + public byte Unknown2 { get; set; } + public LazyRow< Action > Action { get; set; } + public ushort UnlockLink { get; set; } + public byte Recast { get; set; } + public byte UIPriority { get; set; } + public int Icon { get; set; } + public bool Unknown8 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); Description = parser.ReadColumn< SeString >( 1 ); Unknown2 = parser.ReadColumn< byte >( 2 ); - Action = new LazyRow< Action >( lumina, parser.ReadColumn< ushort >( 3 ), language ); + Action = new LazyRow< Action >( gameData, parser.ReadColumn< ushort >( 3 ), language ); UnlockLink = parser.ReadColumn< ushort >( 4 ); Recast = parser.ReadColumn< byte >( 5 ); UIPriority = parser.ReadColumn< byte >( 6 ); diff --git a/src/Lumina.Excel/GeneratedSheets/GilShop.cs b/src/Lumina.Excel/GeneratedSheets/GilShop.cs index 0358c9d8..15d86cf7 100644 --- a/src/Lumina.Excel/GeneratedSheets/GilShop.cs +++ b/src/Lumina.Excel/GeneratedSheets/GilShop.cs @@ -7,29 +7,25 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GilShop", columnHash: 0xa0969241 )] - public class GilShop : IExcelRow + public class GilShop : ExcelRow { - public SeString Name; - public uint Icon; - public LazyRow< Quest > Quest; - public LazyRow< DefaultTalk > AcceptTalk; - public LazyRow< DefaultTalk > FailTalk; - public bool Unknown5; + public SeString Name { get; set; } + public uint Icon { get; set; } + public LazyRow< Quest > Quest { get; set; } + public LazyRow< DefaultTalk > AcceptTalk { get; set; } + public LazyRow< DefaultTalk > FailTalk { get; set; } + public bool Unknown5 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); Icon = parser.ReadColumn< uint >( 1 ); - Quest = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 2 ), language ); - AcceptTalk = new LazyRow< DefaultTalk >( lumina, parser.ReadColumn< int >( 3 ), language ); - FailTalk = new LazyRow< DefaultTalk >( lumina, parser.ReadColumn< int >( 4 ), language ); + Quest = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 2 ), language ); + AcceptTalk = new LazyRow< DefaultTalk >( gameData, parser.ReadColumn< int >( 3 ), language ); + FailTalk = new LazyRow< DefaultTalk >( gameData, parser.ReadColumn< int >( 4 ), language ); Unknown5 = parser.ReadColumn< bool >( 5 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/GilShopItem.cs b/src/Lumina.Excel/GeneratedSheets/GilShopItem.cs index e6fb4157..c26642d8 100644 --- a/src/Lumina.Excel/GeneratedSheets/GilShopItem.cs +++ b/src/Lumina.Excel/GeneratedSheets/GilShopItem.cs @@ -7,26 +7,22 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GilShopItem", columnHash: 0x2f7317fe )] - public class GilShopItem : IExcelRow + public class GilShopItem : ExcelRow { - public LazyRow< Item > Item; - public bool Unknown1; - public int Unknown2; - public int[] RowRequired; - public byte Unknown6; - public ushort StateRequired; - public ushort Patch; + public LazyRow< Item > Item { get; set; } + public bool Unknown1 { get; set; } + public int Unknown2 { get; set; } + public int[] RowRequired { get; set; } + public byte Unknown6 { get; set; } + public ushort StateRequired { get; set; } + public ushort Patch { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Item = new LazyRow< Item >( lumina, parser.ReadColumn< int >( 0 ), language ); + Item = new LazyRow< Item >( gameData, parser.ReadColumn< int >( 0 ), language ); Unknown1 = parser.ReadColumn< bool >( 1 ); Unknown2 = parser.ReadColumn< int >( 2 ); RowRequired = new int[ 3 ]; diff --git a/src/Lumina.Excel/GeneratedSheets/GimmickAccessor.cs b/src/Lumina.Excel/GeneratedSheets/GimmickAccessor.cs index b591bc99..942a4b6b 100644 --- a/src/Lumina.Excel/GeneratedSheets/GimmickAccessor.cs +++ b/src/Lumina.Excel/GeneratedSheets/GimmickAccessor.cs @@ -7,26 +7,22 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GimmickAccessor", columnHash: 0xc4f527f3 )] - public class GimmickAccessor : IExcelRow + public class GimmickAccessor : ExcelRow { - public int Param0; - public uint Param1; - public uint Param2; - public uint Type; - public uint Unknown4; - public uint Unknown5; - public uint Unknown6; - public bool Unknown7; - public bool Unknown8; + public int Param0 { get; set; } + public uint Param1 { get; set; } + public uint Param2 { get; set; } + public uint Type { get; set; } + public uint Unknown4 { get; set; } + public uint Unknown5 { get; set; } + public uint Unknown6 { get; set; } + public bool Unknown7 { get; set; } + public bool Unknown8 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Param0 = parser.ReadColumn< int >( 0 ); Param1 = parser.ReadColumn< uint >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/GimmickJump.cs b/src/Lumina.Excel/GeneratedSheets/GimmickJump.cs index c841ec46..0b7b5374 100644 --- a/src/Lumina.Excel/GeneratedSheets/GimmickJump.cs +++ b/src/Lumina.Excel/GeneratedSheets/GimmickJump.cs @@ -7,28 +7,24 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GimmickJump", columnHash: 0x4858f2f1 )] - public class GimmickJump : IExcelRow + public class GimmickJump : ExcelRow { - public ushort FallDamage; - public sbyte Height; - public LazyRow< ActionTimeline > LoopMotion; - public LazyRow< ActionTimeline > EndMotion; - public bool StartClient; - public bool Unknown5; + public ushort FallDamage { get; set; } + public sbyte Height { get; set; } + public LazyRow< ActionTimeline > LoopMotion { get; set; } + public LazyRow< ActionTimeline > EndMotion { get; set; } + public bool StartClient { get; set; } + public bool Unknown5 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); FallDamage = parser.ReadColumn< ushort >( 0 ); Height = parser.ReadColumn< sbyte >( 1 ); - LoopMotion = new LazyRow< ActionTimeline >( lumina, parser.ReadColumn< uint >( 2 ), language ); - EndMotion = new LazyRow< ActionTimeline >( lumina, parser.ReadColumn< uint >( 3 ), language ); + LoopMotion = new LazyRow< ActionTimeline >( gameData, parser.ReadColumn< uint >( 2 ), language ); + EndMotion = new LazyRow< ActionTimeline >( gameData, parser.ReadColumn< uint >( 3 ), language ); StartClient = parser.ReadColumn< bool >( 4 ); Unknown5 = parser.ReadColumn< bool >( 5 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/GimmickRect.cs b/src/Lumina.Excel/GeneratedSheets/GimmickRect.cs index bfe4aaef..47f9f9d9 100644 --- a/src/Lumina.Excel/GeneratedSheets/GimmickRect.cs +++ b/src/Lumina.Excel/GeneratedSheets/GimmickRect.cs @@ -7,28 +7,24 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GimmickRect", columnHash: 0x9be6d434 )] - public class GimmickRect : IExcelRow + public class GimmickRect : ExcelRow { - public uint LayoutID; - public byte TriggerIn; - public uint Param0; - public uint Unknown3; - public uint Unknown4; - public uint Unknown5; - public byte TriggerOut; - public uint Param1; - public uint Unknown8; - public uint Unknown9; - public uint Unknown10; + public uint LayoutID { get; set; } + public byte TriggerIn { get; set; } + public uint Param0 { get; set; } + public uint Unknown3 { get; set; } + public uint Unknown4 { get; set; } + public uint Unknown5 { get; set; } + public byte TriggerOut { get; set; } + public uint Param1 { get; set; } + public uint Unknown8 { get; set; } + public uint Unknown9 { get; set; } + public uint Unknown10 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); LayoutID = parser.ReadColumn< uint >( 0 ); TriggerIn = parser.ReadColumn< byte >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/GoldSaucerArcadeMachine.cs b/src/Lumina.Excel/GeneratedSheets/GoldSaucerArcadeMachine.cs index 666dfecd..bf738789 100644 --- a/src/Lumina.Excel/GeneratedSheets/GoldSaucerArcadeMachine.cs +++ b/src/Lumina.Excel/GeneratedSheets/GoldSaucerArcadeMachine.cs @@ -7,60 +7,56 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GoldSaucerArcadeMachine", columnHash: 0xacb73d9e )] - public class GoldSaucerArcadeMachine : IExcelRow + public class GoldSaucerArcadeMachine : ExcelRow { - public byte Unknown0; - public byte Unknown1; - public byte Unknown2; - public byte Unknown3; - public ushort Unknown4; - public byte Unknown5; - public uint FailImage; - public sbyte Unknown7; - public sbyte Unknown8; - public sbyte Unknown9; - public uint Unknown10; - public byte Unknown11; - public sbyte Unknown12; - public sbyte Unknown13; - public sbyte Unknown14; - public byte Unknown15; - public byte Unknown16; - public byte Unknown17; - public byte Unknown18; - public byte Unknown19; - public byte Unknown20; - public byte Unknown21; - public byte Unknown22; - public byte Unknown23; - public byte Unknown24; - public byte Unknown25; - public byte Unknown26; - public uint Unknown27; - public uint Unknown28; - public uint Unknown29; - public uint Unknown30; - public byte Unknown31; - public byte Unknown32; - public byte Unknown33; - public byte Unknown34; - public uint Poor; - public uint Good; - public uint Great; - public uint Excellent; - public SeString Unknown39; - public SeString Unknown40; - public SeString Unknown41; - public SeString Unknown42; + public byte Unknown0 { get; set; } + public byte Unknown1 { get; set; } + public byte Unknown2 { get; set; } + public byte Unknown3 { get; set; } + public ushort Unknown4 { get; set; } + public byte Unknown5 { get; set; } + public uint FailImage { get; set; } + public sbyte Unknown7 { get; set; } + public sbyte Unknown8 { get; set; } + public sbyte Unknown9 { get; set; } + public uint Unknown10 { get; set; } + public byte Unknown11 { get; set; } + public sbyte Unknown12 { get; set; } + public sbyte Unknown13 { get; set; } + public sbyte Unknown14 { get; set; } + public byte Unknown15 { get; set; } + public byte Unknown16 { get; set; } + public byte Unknown17 { get; set; } + public byte Unknown18 { get; set; } + public byte Unknown19 { get; set; } + public byte Unknown20 { get; set; } + public byte Unknown21 { get; set; } + public byte Unknown22 { get; set; } + public byte Unknown23 { get; set; } + public byte Unknown24 { get; set; } + public byte Unknown25 { get; set; } + public byte Unknown26 { get; set; } + public uint Unknown27 { get; set; } + public uint Unknown28 { get; set; } + public uint Unknown29 { get; set; } + public uint Unknown30 { get; set; } + public byte Unknown31 { get; set; } + public byte Unknown32 { get; set; } + public byte Unknown33 { get; set; } + public byte Unknown34 { get; set; } + public uint Poor { get; set; } + public uint Good { get; set; } + public uint Great { get; set; } + public uint Excellent { get; set; } + public SeString Unknown39 { get; set; } + public SeString Unknown40 { get; set; } + public SeString Unknown41 { get; set; } + public SeString Unknown42 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< byte >( 0 ); Unknown1 = parser.ReadColumn< byte >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/GoldSaucerTextData.cs b/src/Lumina.Excel/GeneratedSheets/GoldSaucerTextData.cs index e8b02ac6..8eec221d 100644 --- a/src/Lumina.Excel/GeneratedSheets/GoldSaucerTextData.cs +++ b/src/Lumina.Excel/GeneratedSheets/GoldSaucerTextData.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GoldSaucerTextData", columnHash: 0xdebb20e3 )] - public class GoldSaucerTextData : IExcelRow + public class GoldSaucerTextData : ExcelRow { - public SeString Text; + public SeString Text { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Text = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/GrandCompany.cs b/src/Lumina.Excel/GeneratedSheets/GrandCompany.cs index 89b0145f..82a211b8 100644 --- a/src/Lumina.Excel/GeneratedSheets/GrandCompany.cs +++ b/src/Lumina.Excel/GeneratedSheets/GrandCompany.cs @@ -7,27 +7,23 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GrandCompany", columnHash: 0x472d6d8c )] - public class GrandCompany : IExcelRow + public class GrandCompany : ExcelRow { - public SeString Name; - public sbyte Unknown1; - public SeString Unknown2; - public sbyte Unknown3; - public sbyte Unknown4; - public sbyte Unknown5; - public sbyte Unknown6; - public sbyte Unknown7; - public SeString Unknown8; - public sbyte Unknown9; + public SeString Name { get; set; } + public sbyte Unknown1 { get; set; } + public SeString Unknown2 { get; set; } + public sbyte Unknown3 { get; set; } + public sbyte Unknown4 { get; set; } + public sbyte Unknown5 { get; set; } + public sbyte Unknown6 { get; set; } + public sbyte Unknown7 { get; set; } + public SeString Unknown8 { get; set; } + public sbyte Unknown9 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); Unknown1 = parser.ReadColumn< sbyte >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/GrandCompanyRank.cs b/src/Lumina.Excel/GeneratedSheets/GrandCompanyRank.cs index dd9e6321..9c79e034 100644 --- a/src/Lumina.Excel/GeneratedSheets/GrandCompanyRank.cs +++ b/src/Lumina.Excel/GeneratedSheets/GrandCompanyRank.cs @@ -7,28 +7,24 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GrandCompanyRank", columnHash: 0x939f7424 )] - public class GrandCompanyRank : IExcelRow + public class GrandCompanyRank : ExcelRow { - public byte Tier; - public byte Order; - public uint MaxSeals; - public uint RequiredSeals; - public int IconMaelstrom; - public int IconSerpents; - public int IconFlames; - public LazyRow< Quest > QuestMaelstrom; - public LazyRow< Quest > QuestSerpents; - public LazyRow< Quest > QuestFlames; - public byte Unknown10; + public byte Tier { get; set; } + public byte Order { get; set; } + public uint MaxSeals { get; set; } + public uint RequiredSeals { get; set; } + public int IconMaelstrom { get; set; } + public int IconSerpents { get; set; } + public int IconFlames { get; set; } + public LazyRow< Quest > QuestMaelstrom { get; set; } + public LazyRow< Quest > QuestSerpents { get; set; } + public LazyRow< Quest > QuestFlames { get; set; } + public byte Unknown10 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Tier = parser.ReadColumn< byte >( 0 ); Order = parser.ReadColumn< byte >( 1 ); @@ -37,9 +33,9 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) IconMaelstrom = parser.ReadColumn< int >( 4 ); IconSerpents = parser.ReadColumn< int >( 5 ); IconFlames = parser.ReadColumn< int >( 6 ); - QuestMaelstrom = new LazyRow< Quest >( lumina, parser.ReadColumn< int >( 7 ), language ); - QuestSerpents = new LazyRow< Quest >( lumina, parser.ReadColumn< int >( 8 ), language ); - QuestFlames = new LazyRow< Quest >( lumina, parser.ReadColumn< int >( 9 ), language ); + QuestMaelstrom = new LazyRow< Quest >( gameData, parser.ReadColumn< int >( 7 ), language ); + QuestSerpents = new LazyRow< Quest >( gameData, parser.ReadColumn< int >( 8 ), language ); + QuestFlames = new LazyRow< Quest >( gameData, parser.ReadColumn< int >( 9 ), language ); Unknown10 = parser.ReadColumn< byte >( 10 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/GroupPoseFrame.cs b/src/Lumina.Excel/GeneratedSheets/GroupPoseFrame.cs index 2b26fc34..a084098c 100644 --- a/src/Lumina.Excel/GeneratedSheets/GroupPoseFrame.cs +++ b/src/Lumina.Excel/GeneratedSheets/GroupPoseFrame.cs @@ -7,25 +7,21 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GroupPoseFrame", columnHash: 0x1771561e )] - public class GroupPoseFrame : IExcelRow + public class GroupPoseFrame : ExcelRow { - public int Unknown0; - public int Image; - public SeString GridText; - public int Unknown3; - public uint Unknown4; - public byte Unknown5; - public int Unknown54; - public SeString Text; + public int Unknown0 { get; set; } + public int Image { get; set; } + public SeString GridText { get; set; } + public int Unknown3 { get; set; } + public uint Unknown4 { get; set; } + public byte Unknown5 { get; set; } + public int Unknown54 { get; set; } + public SeString Text { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< int >( 0 ); Image = parser.ReadColumn< int >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/GroupPoseStamp.cs b/src/Lumina.Excel/GeneratedSheets/GroupPoseStamp.cs index 03068293..0cca288d 100644 --- a/src/Lumina.Excel/GeneratedSheets/GroupPoseStamp.cs +++ b/src/Lumina.Excel/GeneratedSheets/GroupPoseStamp.cs @@ -7,30 +7,26 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GroupPoseStamp", columnHash: 0x168074a1 )] - public class GroupPoseStamp : IExcelRow + public class GroupPoseStamp : ExcelRow { - public int StampIcon; - public int Unknown1; - public LazyRow< GroupPoseStampCategory > Category; - public ushort Unknown3; - public int Unknown540; - public bool Unknown541; - public bool Unknown6; - public bool Unknown7; - public SeString Name; + public int StampIcon { get; set; } + public int Unknown1 { get; set; } + public LazyRow< GroupPoseStampCategory > Category { get; set; } + public ushort Unknown3 { get; set; } + public int Unknown540 { get; set; } + public bool Unknown541 { get; set; } + public bool Unknown6 { get; set; } + public bool Unknown7 { get; set; } + public SeString Name { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); StampIcon = parser.ReadColumn< int >( 0 ); Unknown1 = parser.ReadColumn< int >( 1 ); - Category = new LazyRow< GroupPoseStampCategory >( lumina, parser.ReadColumn< int >( 2 ), language ); + Category = new LazyRow< GroupPoseStampCategory >( gameData, parser.ReadColumn< int >( 2 ), language ); Unknown3 = parser.ReadColumn< ushort >( 3 ); Unknown540 = parser.ReadColumn< int >( 4 ); Unknown541 = parser.ReadColumn< bool >( 5 ); diff --git a/src/Lumina.Excel/GeneratedSheets/GroupPoseStampCategory.cs b/src/Lumina.Excel/GeneratedSheets/GroupPoseStampCategory.cs index 574d175a..ec65233f 100644 --- a/src/Lumina.Excel/GeneratedSheets/GroupPoseStampCategory.cs +++ b/src/Lumina.Excel/GeneratedSheets/GroupPoseStampCategory.cs @@ -7,19 +7,15 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GroupPoseStampCategory", columnHash: 0x5eb59ccb )] - public class GroupPoseStampCategory : IExcelRow + public class GroupPoseStampCategory : ExcelRow { - public byte Unknown0; - public SeString Name; + public byte Unknown0 { get; set; } + public SeString Name { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< byte >( 0 ); Name = parser.ReadColumn< SeString >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/GuardianDeity.cs b/src/Lumina.Excel/GeneratedSheets/GuardianDeity.cs index f9e09ee9..4aded67e 100644 --- a/src/Lumina.Excel/GeneratedSheets/GuardianDeity.cs +++ b/src/Lumina.Excel/GeneratedSheets/GuardianDeity.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GuardianDeity", columnHash: 0x79bad589 )] - public class GuardianDeity : IExcelRow + public class GuardianDeity : ExcelRow { - public SeString Name; - public SeString Description; - public ushort Icon; + public SeString Name { get; set; } + public SeString Description { get; set; } + public ushort Icon { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); Description = parser.ReadColumn< SeString >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/Guide.cs b/src/Lumina.Excel/GeneratedSheets/Guide.cs index 00aa4eba..bb178bdf 100644 --- a/src/Lumina.Excel/GeneratedSheets/Guide.cs +++ b/src/Lumina.Excel/GeneratedSheets/Guide.cs @@ -7,22 +7,18 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Guide", columnHash: 0x2020acf6 )] - public class Guide : IExcelRow + public class Guide : ExcelRow { - public LazyRow< GuideTitle > GuideTitle; - public LazyRow< GuidePage > GuidePage; + public LazyRow< GuideTitle > GuideTitle { get; set; } + public LazyRow< GuidePage > GuidePage { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - GuideTitle = new LazyRow< GuideTitle >( lumina, parser.ReadColumn< ushort >( 0 ), language ); - GuidePage = new LazyRow< GuidePage >( lumina, parser.ReadColumn< ushort >( 1 ), language ); + GuideTitle = new LazyRow< GuideTitle >( gameData, parser.ReadColumn< ushort >( 0 ), language ); + GuidePage = new LazyRow< GuidePage >( gameData, parser.ReadColumn< ushort >( 1 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/GuidePage.cs b/src/Lumina.Excel/GeneratedSheets/GuidePage.cs index fc44ede0..9a54f092 100644 --- a/src/Lumina.Excel/GeneratedSheets/GuidePage.cs +++ b/src/Lumina.Excel/GeneratedSheets/GuidePage.cs @@ -7,19 +7,15 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GuidePage", columnHash: 0x5bfa8a4e )] - public class GuidePage : IExcelRow + public class GuidePage : ExcelRow { - public byte Key; - public uint Output; + public byte Key { get; set; } + public uint Output { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Key = parser.ReadColumn< byte >( 0 ); Output = parser.ReadColumn< uint >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/GuidePageString.cs b/src/Lumina.Excel/GeneratedSheets/GuidePageString.cs index 8ba8b223..85fc2a48 100644 --- a/src/Lumina.Excel/GeneratedSheets/GuidePageString.cs +++ b/src/Lumina.Excel/GeneratedSheets/GuidePageString.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GuidePageString", columnHash: 0xdebb20e3 )] - public class GuidePageString : IExcelRow + public class GuidePageString : ExcelRow { - public SeString String; + public SeString String { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); String = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/GuideTitle.cs b/src/Lumina.Excel/GeneratedSheets/GuideTitle.cs index 84587b6a..eec1441a 100644 --- a/src/Lumina.Excel/GeneratedSheets/GuideTitle.cs +++ b/src/Lumina.Excel/GeneratedSheets/GuideTitle.cs @@ -7,19 +7,15 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GuideTitle", columnHash: 0x9db0e48f )] - public class GuideTitle : IExcelRow + public class GuideTitle : ExcelRow { - public SeString Title; - public SeString Unknown1; + public SeString Title { get; set; } + public SeString Unknown1 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Title = parser.ReadColumn< SeString >( 0 ); Unknown1 = parser.ReadColumn< SeString >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/GuildOrder.cs b/src/Lumina.Excel/GeneratedSheets/GuildOrder.cs index 88c5f271..ba466d46 100644 --- a/src/Lumina.Excel/GeneratedSheets/GuildOrder.cs +++ b/src/Lumina.Excel/GeneratedSheets/GuildOrder.cs @@ -7,36 +7,32 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GuildOrder", columnHash: 0xbdf9fa30 )] - public class GuildOrder : IExcelRow + public class GuildOrder : ExcelRow { - public LazyRow< ENpcResident > ENpcName; - public SeString Objective; - public SeString Description1; - public SeString Description2; - public SeString Description3; - public uint CompletionBonusExp; - public uint RewardExp; - public uint CompletionBonusGil; - public uint RewardGil; - public uint Unknown9; - public uint Unknown10; - public uint Unknown11; - public uint Unknown12; - public ushort Unknown13; - public ushort Unknown14; - public bool Unknown15; - public bool Unknown16; + public LazyRow< ENpcResident > ENpcName { get; set; } + public SeString Objective { get; set; } + public SeString Description1 { get; set; } + public SeString Description2 { get; set; } + public SeString Description3 { get; set; } + public uint CompletionBonusExp { get; set; } + public uint RewardExp { get; set; } + public uint CompletionBonusGil { get; set; } + public uint RewardGil { get; set; } + public uint Unknown9 { get; set; } + public uint Unknown10 { get; set; } + public uint Unknown11 { get; set; } + public uint Unknown12 { get; set; } + public ushort Unknown13 { get; set; } + public ushort Unknown14 { get; set; } + public bool Unknown15 { get; set; } + public bool Unknown16 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - ENpcName = new LazyRow< ENpcResident >( lumina, parser.ReadColumn< uint >( 0 ), language ); + ENpcName = new LazyRow< ENpcResident >( gameData, parser.ReadColumn< uint >( 0 ), language ); Objective = parser.ReadColumn< SeString >( 1 ); Description1 = parser.ReadColumn< SeString >( 2 ); Description2 = parser.ReadColumn< SeString >( 3 ); diff --git a/src/Lumina.Excel/GeneratedSheets/GuildOrderGuide.cs b/src/Lumina.Excel/GeneratedSheets/GuildOrderGuide.cs index d68bfd0d..77602062 100644 --- a/src/Lumina.Excel/GeneratedSheets/GuildOrderGuide.cs +++ b/src/Lumina.Excel/GeneratedSheets/GuildOrderGuide.cs @@ -7,23 +7,19 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GuildOrderGuide", columnHash: 0xa76e50e1 )] - public class GuildOrderGuide : IExcelRow + public class GuildOrderGuide : ExcelRow { - public uint Unknown0; - public uint Unknown1; - public uint Unknown2; - public uint Unknown3; - public uint Unknown4; - public uint Unknown5; + public uint Unknown0 { get; set; } + public uint Unknown1 { get; set; } + public uint Unknown2 { get; set; } + public uint Unknown3 { get; set; } + public uint Unknown4 { get; set; } + public uint Unknown5 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< uint >( 0 ); Unknown1 = parser.ReadColumn< uint >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/GuildOrderOfficer.cs b/src/Lumina.Excel/GeneratedSheets/GuildOrderOfficer.cs index 44bae63c..e0fe9d9a 100644 --- a/src/Lumina.Excel/GeneratedSheets/GuildOrderOfficer.cs +++ b/src/Lumina.Excel/GeneratedSheets/GuildOrderOfficer.cs @@ -7,23 +7,19 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GuildOrderOfficer", columnHash: 0xa76e50e1 )] - public class GuildOrderOfficer : IExcelRow + public class GuildOrderOfficer : ExcelRow { - public uint Unknown0; - public uint Unknown1; - public uint Unknown2; - public uint Unknown3; - public uint Unknown4; - public uint Unknown5; + public uint Unknown0 { get; set; } + public uint Unknown1 { get; set; } + public uint Unknown2 { get; set; } + public uint Unknown3 { get; set; } + public uint Unknown4 { get; set; } + public uint Unknown5 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< uint >( 0 ); Unknown1 = parser.ReadColumn< uint >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/GuildleveAssignment.cs b/src/Lumina.Excel/GeneratedSheets/GuildleveAssignment.cs index 56c66db8..3dd7313f 100644 --- a/src/Lumina.Excel/GeneratedSheets/GuildleveAssignment.cs +++ b/src/Lumina.Excel/GeneratedSheets/GuildleveAssignment.cs @@ -7,34 +7,30 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GuildleveAssignment", columnHash: 0x129d93fa )] - public class GuildleveAssignment : IExcelRow + public class GuildleveAssignment : ExcelRow { - public SeString Unknown0; - public byte AddedIn53; - public uint AssignmentTalk; - public LazyRow< Quest >[] Quest; - public bool Unknown5; - public bool Unknown6; - public bool Unknown7; - public bool Unknown8; - public bool Unknown9; - public byte Unknown10; + public SeString Unknown0 { get; set; } + public byte AddedIn53 { get; set; } + public uint AssignmentTalk { get; set; } + public LazyRow< Quest >[] Quest { get; set; } + public bool Unknown5 { get; set; } + public bool Unknown6 { get; set; } + public bool Unknown7 { get; set; } + public bool Unknown8 { get; set; } + public bool Unknown9 { get; set; } + public byte Unknown10 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< SeString >( 0 ); AddedIn53 = parser.ReadColumn< byte >( 1 ); AssignmentTalk = parser.ReadColumn< uint >( 2 ); Quest = new LazyRow< Quest >[ 2 ]; for( var i = 0; i < 2; i++ ) - Quest[ i ] = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 3 + i ), language ); + Quest[ i ] = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 3 + i ), language ); Unknown5 = parser.ReadColumn< bool >( 5 ); Unknown6 = parser.ReadColumn< bool >( 6 ); Unknown7 = parser.ReadColumn< bool >( 7 ); diff --git a/src/Lumina.Excel/GeneratedSheets/GuildleveAssignmentCategory.cs b/src/Lumina.Excel/GeneratedSheets/GuildleveAssignmentCategory.cs index 9a85645c..191ab806 100644 --- a/src/Lumina.Excel/GeneratedSheets/GuildleveAssignmentCategory.cs +++ b/src/Lumina.Excel/GeneratedSheets/GuildleveAssignmentCategory.cs @@ -7,22 +7,18 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "GuildleveAssignmentCategory", columnHash: 0xeb15b554 )] - public class GuildleveAssignmentCategory : IExcelRow + public class GuildleveAssignmentCategory : ExcelRow { - public LazyRow< LeveAssignmentType >[] Category; + public LazyRow< LeveAssignmentType >[] Category { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Category = new LazyRow< LeveAssignmentType >[ 8 ]; for( var i = 0; i < 8; i++ ) - Category[ i ] = new LazyRow< LeveAssignmentType >( lumina, parser.ReadColumn< int >( 0 + i ), language ); + Category[ i ] = new LazyRow< LeveAssignmentType >( gameData, parser.ReadColumn< int >( 0 + i ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/HWDAnnounce.cs b/src/Lumina.Excel/GeneratedSheets/HWDAnnounce.cs index bf43e60a..f7a3032d 100644 --- a/src/Lumina.Excel/GeneratedSheets/HWDAnnounce.cs +++ b/src/Lumina.Excel/GeneratedSheets/HWDAnnounce.cs @@ -7,24 +7,20 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "HWDAnnounce", columnHash: 0x1d91a784 )] - public class HWDAnnounce : IExcelRow + public class HWDAnnounce : ExcelRow { - public SeString Name; - public LazyRow< ENpcResident > ENPC; - public byte Unknown2; - public byte Unknown3; + public SeString Name { get; set; } + public LazyRow< ENpcResident > ENPC { get; set; } + public byte Unknown2 { get; set; } + public byte Unknown3 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); - ENPC = new LazyRow< ENpcResident >( lumina, parser.ReadColumn< uint >( 1 ), language ); + ENPC = new LazyRow< ENpcResident >( gameData, parser.ReadColumn< uint >( 1 ), language ); Unknown2 = parser.ReadColumn< byte >( 2 ); Unknown3 = parser.ReadColumn< byte >( 3 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/HWDCrafterSupply.cs b/src/Lumina.Excel/GeneratedSheets/HWDCrafterSupply.cs index e67f6371..0f44d3dd 100644 --- a/src/Lumina.Excel/GeneratedSheets/HWDCrafterSupply.cs +++ b/src/Lumina.Excel/GeneratedSheets/HWDCrafterSupply.cs @@ -7,242 +7,112 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "HWDCrafterSupply", columnHash: 0xa04b4cc9 )] - public class HWDCrafterSupply : IExcelRow + public class HWDCrafterSupply : ExcelRow { - public LazyRow< Item >[] ItemTradeIn; - public byte[] Level; - public byte[] LevelMax; - public byte[] BaseCollectableRating; - public ushort[] MidCollectableRating; - public ushort[] HighCollectableRating; - public ushort Unknown138; - public ushort Unknown139; - public ushort Unknown140; - public ushort Unknown141; - public ushort Unknown142; - public ushort Unknown143; - public ushort Unknown144; - public ushort Unknown145; - public ushort Unknown146; - public ushort Unknown147; - public ushort Unknown148; - public ushort Unknown149; - public ushort Unknown150; - public ushort Unknown151; - public ushort Unknown152; - public ushort Unknown153; - public ushort Unknown154; - public ushort Unknown155; - public ushort Unknown156; - public ushort Unknown157; - public ushort Unknown158; - public ushort Unknown159; - public ushort Unknown160; - public ushort Unknown161; - public ushort Unknown162; - public ushort Unknown163; - public ushort Unknown164; - public ushort Unknown165; - public ushort Unknown166; - public ushort Unknown167; - public ushort Unknown168; - public ushort Unknown169; - public ushort Unknown170; - public ushort Unknown171; - public ushort Unknown172; - public ushort Unknown173; - public ushort Unknown174; - public ushort Unknown175; - public ushort Unknown176; - public ushort Unknown177; - public ushort Unknown178; - public ushort Unknown179; - public ushort Unknown180; - public ushort Unknown181; - public ushort Unknown182; - public ushort Unknown183; - public ushort Unknown184; - public ushort Unknown185; - public ushort Unknown186; - public ushort Unknown187; - public ushort Unknown188; - public ushort Unknown189; - public ushort Unknown190; - public ushort Unknown191; - public ushort Unknown192; - public ushort Unknown193; - public ushort Unknown194; - public ushort Unknown195; - public ushort Unknown196; - public ushort Unknown197; - public ushort Unknown198; - public ushort Unknown199; - public ushort Unknown200; - public ushort Unknown201; - public ushort Unknown202; - public ushort Unknown203; - public ushort Unknown204; - public ushort Unknown205; - public ushort Unknown206; - public ushort Unknown207; - public ushort Unknown208; - public ushort Unknown209; - public ushort Unknown210; - public ushort Unknown211; - public ushort Unknown212; - public ushort Unknown213; - public ushort Unknown214; - public ushort Unknown215; - public ushort Unknown216; - public ushort Unknown217; - public ushort Unknown218; - public ushort Unknown219; - public ushort Unknown220; - public ushort Unknown221; - public ushort Unknown222; - public ushort Unknown223; - public ushort Unknown224; - public ushort Unknown225; - public ushort Unknown226; - public ushort Unknown227; - public ushort Unknown228; - public ushort Unknown229; - public LazyRow< HWDCrafterSupplyReward >[] BaseCollectableReward; - public LazyRow< HWDCrafterSupplyReward >[] MidCollectableReward; - public LazyRow< HWDCrafterSupplyReward >[] HighCollectableReward; - public LazyRow< HWDCrafterSupplyTerm >[] TermName; + public LazyRow< Item >[] ItemTradeIn { get; set; } + public byte[] Level { get; set; } + public byte[] LevelMax { get; set; } + public byte Unknown69 { get; set; } + public byte Unknown70 { get; set; } + public byte Unknown71 { get; set; } + public byte Unknown72 { get; set; } + public byte Unknown73 { get; set; } + public byte Unknown74 { get; set; } + public byte Unknown75 { get; set; } + public byte Unknown76 { get; set; } + public byte Unknown77 { get; set; } + public byte Unknown78 { get; set; } + public byte Unknown79 { get; set; } + public byte Unknown80 { get; set; } + public byte Unknown81 { get; set; } + public byte Unknown82 { get; set; } + public byte Unknown83 { get; set; } + public byte Unknown84 { get; set; } + public byte Unknown85 { get; set; } + public byte Unknown86 { get; set; } + public byte Unknown87 { get; set; } + public byte Unknown88 { get; set; } + public byte Unknown89 { get; set; } + public byte Unknown90 { get; set; } + public byte Unknown91 { get; set; } + public ushort[] BaseCollectableRating { get; set; } + public ushort[] MidCollectableRating { get; set; } + public ushort[] HighCollectableRating { get; set; } + public LazyRow< HWDCrafterSupplyReward >[] BaseCollectableReward { get; set; } + public LazyRow< HWDCrafterSupplyReward >[] MidCollectableReward { get; set; } + public LazyRow< HWDCrafterSupplyReward >[] HighCollectableReward { get; set; } + public LazyRow< HWDCrafterSupplyReward >[] BaseCollectableRewardPostPhase { get; set; } + public LazyRow< HWDCrafterSupplyReward >[] MidCollectableRewardPostPhase { get; set; } + public LazyRow< HWDCrafterSupplyReward >[] HighCollectableRewardPostPhase { get; set; } + public LazyRow< HWDCrafterSupplyTerm >[] TermName { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); ItemTradeIn = new LazyRow< Item >[ 23 ]; for( var i = 0; i < 23; i++ ) - ItemTradeIn[ i ] = new LazyRow< Item >( lumina, parser.ReadColumn< uint >( 0 + i ), language ); + ItemTradeIn[ i ] = new LazyRow< Item >( gameData, parser.ReadColumn< uint >( 0 + i ), language ); Level = new byte[ 23 ]; for( var i = 0; i < 23; i++ ) Level[ i ] = parser.ReadColumn< byte >( 23 + i ); LevelMax = new byte[ 23 ]; for( var i = 0; i < 23; i++ ) LevelMax[ i ] = parser.ReadColumn< byte >( 46 + i ); - BaseCollectableRating = new byte[ 23 ]; + Unknown69 = parser.ReadColumn< byte >( 69 ); + Unknown70 = parser.ReadColumn< byte >( 70 ); + Unknown71 = parser.ReadColumn< byte >( 71 ); + Unknown72 = parser.ReadColumn< byte >( 72 ); + Unknown73 = parser.ReadColumn< byte >( 73 ); + Unknown74 = parser.ReadColumn< byte >( 74 ); + Unknown75 = parser.ReadColumn< byte >( 75 ); + Unknown76 = parser.ReadColumn< byte >( 76 ); + Unknown77 = parser.ReadColumn< byte >( 77 ); + Unknown78 = parser.ReadColumn< byte >( 78 ); + Unknown79 = parser.ReadColumn< byte >( 79 ); + Unknown80 = parser.ReadColumn< byte >( 80 ); + Unknown81 = parser.ReadColumn< byte >( 81 ); + Unknown82 = parser.ReadColumn< byte >( 82 ); + Unknown83 = parser.ReadColumn< byte >( 83 ); + Unknown84 = parser.ReadColumn< byte >( 84 ); + Unknown85 = parser.ReadColumn< byte >( 85 ); + Unknown86 = parser.ReadColumn< byte >( 86 ); + Unknown87 = parser.ReadColumn< byte >( 87 ); + Unknown88 = parser.ReadColumn< byte >( 88 ); + Unknown89 = parser.ReadColumn< byte >( 89 ); + Unknown90 = parser.ReadColumn< byte >( 90 ); + Unknown91 = parser.ReadColumn< byte >( 91 ); + BaseCollectableRating = new ushort[ 23 ]; for( var i = 0; i < 23; i++ ) - BaseCollectableRating[ i ] = parser.ReadColumn< byte >( 69 + i ); + BaseCollectableRating[ i ] = parser.ReadColumn< ushort >( 92 + i ); MidCollectableRating = new ushort[ 23 ]; for( var i = 0; i < 23; i++ ) - MidCollectableRating[ i ] = parser.ReadColumn< ushort >( 92 + i ); + MidCollectableRating[ i ] = parser.ReadColumn< ushort >( 115 + i ); HighCollectableRating = new ushort[ 23 ]; for( var i = 0; i < 23; i++ ) - HighCollectableRating[ i ] = parser.ReadColumn< ushort >( 115 + i ); - Unknown138 = parser.ReadColumn< ushort >( 138 ); - Unknown139 = parser.ReadColumn< ushort >( 139 ); - Unknown140 = parser.ReadColumn< ushort >( 140 ); - Unknown141 = parser.ReadColumn< ushort >( 141 ); - Unknown142 = parser.ReadColumn< ushort >( 142 ); - Unknown143 = parser.ReadColumn< ushort >( 143 ); - Unknown144 = parser.ReadColumn< ushort >( 144 ); - Unknown145 = parser.ReadColumn< ushort >( 145 ); - Unknown146 = parser.ReadColumn< ushort >( 146 ); - Unknown147 = parser.ReadColumn< ushort >( 147 ); - Unknown148 = parser.ReadColumn< ushort >( 148 ); - Unknown149 = parser.ReadColumn< ushort >( 149 ); - Unknown150 = parser.ReadColumn< ushort >( 150 ); - Unknown151 = parser.ReadColumn< ushort >( 151 ); - Unknown152 = parser.ReadColumn< ushort >( 152 ); - Unknown153 = parser.ReadColumn< ushort >( 153 ); - Unknown154 = parser.ReadColumn< ushort >( 154 ); - Unknown155 = parser.ReadColumn< ushort >( 155 ); - Unknown156 = parser.ReadColumn< ushort >( 156 ); - Unknown157 = parser.ReadColumn< ushort >( 157 ); - Unknown158 = parser.ReadColumn< ushort >( 158 ); - Unknown159 = parser.ReadColumn< ushort >( 159 ); - Unknown160 = parser.ReadColumn< ushort >( 160 ); - Unknown161 = parser.ReadColumn< ushort >( 161 ); - Unknown162 = parser.ReadColumn< ushort >( 162 ); - Unknown163 = parser.ReadColumn< ushort >( 163 ); - Unknown164 = parser.ReadColumn< ushort >( 164 ); - Unknown165 = parser.ReadColumn< ushort >( 165 ); - Unknown166 = parser.ReadColumn< ushort >( 166 ); - Unknown167 = parser.ReadColumn< ushort >( 167 ); - Unknown168 = parser.ReadColumn< ushort >( 168 ); - Unknown169 = parser.ReadColumn< ushort >( 169 ); - Unknown170 = parser.ReadColumn< ushort >( 170 ); - Unknown171 = parser.ReadColumn< ushort >( 171 ); - Unknown172 = parser.ReadColumn< ushort >( 172 ); - Unknown173 = parser.ReadColumn< ushort >( 173 ); - Unknown174 = parser.ReadColumn< ushort >( 174 ); - Unknown175 = parser.ReadColumn< ushort >( 175 ); - Unknown176 = parser.ReadColumn< ushort >( 176 ); - Unknown177 = parser.ReadColumn< ushort >( 177 ); - Unknown178 = parser.ReadColumn< ushort >( 178 ); - Unknown179 = parser.ReadColumn< ushort >( 179 ); - Unknown180 = parser.ReadColumn< ushort >( 180 ); - Unknown181 = parser.ReadColumn< ushort >( 181 ); - Unknown182 = parser.ReadColumn< ushort >( 182 ); - Unknown183 = parser.ReadColumn< ushort >( 183 ); - Unknown184 = parser.ReadColumn< ushort >( 184 ); - Unknown185 = parser.ReadColumn< ushort >( 185 ); - Unknown186 = parser.ReadColumn< ushort >( 186 ); - Unknown187 = parser.ReadColumn< ushort >( 187 ); - Unknown188 = parser.ReadColumn< ushort >( 188 ); - Unknown189 = parser.ReadColumn< ushort >( 189 ); - Unknown190 = parser.ReadColumn< ushort >( 190 ); - Unknown191 = parser.ReadColumn< ushort >( 191 ); - Unknown192 = parser.ReadColumn< ushort >( 192 ); - Unknown193 = parser.ReadColumn< ushort >( 193 ); - Unknown194 = parser.ReadColumn< ushort >( 194 ); - Unknown195 = parser.ReadColumn< ushort >( 195 ); - Unknown196 = parser.ReadColumn< ushort >( 196 ); - Unknown197 = parser.ReadColumn< ushort >( 197 ); - Unknown198 = parser.ReadColumn< ushort >( 198 ); - Unknown199 = parser.ReadColumn< ushort >( 199 ); - Unknown200 = parser.ReadColumn< ushort >( 200 ); - Unknown201 = parser.ReadColumn< ushort >( 201 ); - Unknown202 = parser.ReadColumn< ushort >( 202 ); - Unknown203 = parser.ReadColumn< ushort >( 203 ); - Unknown204 = parser.ReadColumn< ushort >( 204 ); - Unknown205 = parser.ReadColumn< ushort >( 205 ); - Unknown206 = parser.ReadColumn< ushort >( 206 ); - Unknown207 = parser.ReadColumn< ushort >( 207 ); - Unknown208 = parser.ReadColumn< ushort >( 208 ); - Unknown209 = parser.ReadColumn< ushort >( 209 ); - Unknown210 = parser.ReadColumn< ushort >( 210 ); - Unknown211 = parser.ReadColumn< ushort >( 211 ); - Unknown212 = parser.ReadColumn< ushort >( 212 ); - Unknown213 = parser.ReadColumn< ushort >( 213 ); - Unknown214 = parser.ReadColumn< ushort >( 214 ); - Unknown215 = parser.ReadColumn< ushort >( 215 ); - Unknown216 = parser.ReadColumn< ushort >( 216 ); - Unknown217 = parser.ReadColumn< ushort >( 217 ); - Unknown218 = parser.ReadColumn< ushort >( 218 ); - Unknown219 = parser.ReadColumn< ushort >( 219 ); - Unknown220 = parser.ReadColumn< ushort >( 220 ); - Unknown221 = parser.ReadColumn< ushort >( 221 ); - Unknown222 = parser.ReadColumn< ushort >( 222 ); - Unknown223 = parser.ReadColumn< ushort >( 223 ); - Unknown224 = parser.ReadColumn< ushort >( 224 ); - Unknown225 = parser.ReadColumn< ushort >( 225 ); - Unknown226 = parser.ReadColumn< ushort >( 226 ); - Unknown227 = parser.ReadColumn< ushort >( 227 ); - Unknown228 = parser.ReadColumn< ushort >( 228 ); - Unknown229 = parser.ReadColumn< ushort >( 229 ); + HighCollectableRating[ i ] = parser.ReadColumn< ushort >( 138 + i ); BaseCollectableReward = new LazyRow< HWDCrafterSupplyReward >[ 23 ]; for( var i = 0; i < 23; i++ ) - BaseCollectableReward[ i ] = new LazyRow< HWDCrafterSupplyReward >( lumina, parser.ReadColumn< ushort >( 230 + i ), language ); + BaseCollectableReward[ i ] = new LazyRow< HWDCrafterSupplyReward >( gameData, parser.ReadColumn< ushort >( 161 + i ), language ); MidCollectableReward = new LazyRow< HWDCrafterSupplyReward >[ 23 ]; for( var i = 0; i < 23; i++ ) - MidCollectableReward[ i ] = new LazyRow< HWDCrafterSupplyReward >( lumina, parser.ReadColumn< ushort >( 253 + i ), language ); + MidCollectableReward[ i ] = new LazyRow< HWDCrafterSupplyReward >( gameData, parser.ReadColumn< ushort >( 184 + i ), language ); HighCollectableReward = new LazyRow< HWDCrafterSupplyReward >[ 23 ]; for( var i = 0; i < 23; i++ ) - HighCollectableReward[ i ] = new LazyRow< HWDCrafterSupplyReward >( lumina, parser.ReadColumn< ushort >( 276 + i ), language ); + HighCollectableReward[ i ] = new LazyRow< HWDCrafterSupplyReward >( gameData, parser.ReadColumn< ushort >( 207 + i ), language ); + BaseCollectableRewardPostPhase = new LazyRow< HWDCrafterSupplyReward >[ 23 ]; + for( var i = 0; i < 23; i++ ) + BaseCollectableRewardPostPhase[ i ] = new LazyRow< HWDCrafterSupplyReward >( gameData, parser.ReadColumn< ushort >( 230 + i ), language ); + MidCollectableRewardPostPhase = new LazyRow< HWDCrafterSupplyReward >[ 23 ]; + for( var i = 0; i < 23; i++ ) + MidCollectableRewardPostPhase[ i ] = new LazyRow< HWDCrafterSupplyReward >( gameData, parser.ReadColumn< ushort >( 253 + i ), language ); + HighCollectableRewardPostPhase = new LazyRow< HWDCrafterSupplyReward >[ 23 ]; + for( var i = 0; i < 23; i++ ) + HighCollectableRewardPostPhase[ i ] = new LazyRow< HWDCrafterSupplyReward >( gameData, parser.ReadColumn< ushort >( 276 + i ), language ); TermName = new LazyRow< HWDCrafterSupplyTerm >[ 23 ]; for( var i = 0; i < 23; i++ ) - TermName[ i ] = new LazyRow< HWDCrafterSupplyTerm >( lumina, parser.ReadColumn< byte >( 299 + i ), language ); + TermName[ i ] = new LazyRow< HWDCrafterSupplyTerm >( gameData, parser.ReadColumn< byte >( 299 + i ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/HWDCrafterSupplyReward.cs b/src/Lumina.Excel/GeneratedSheets/HWDCrafterSupplyReward.cs index e3f7fcc0..b38e6ada 100644 --- a/src/Lumina.Excel/GeneratedSheets/HWDCrafterSupplyReward.cs +++ b/src/Lumina.Excel/GeneratedSheets/HWDCrafterSupplyReward.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "HWDCrafterSupplyReward", columnHash: 0x829e9d8e )] - public class HWDCrafterSupplyReward : IExcelRow + public class HWDCrafterSupplyReward : ExcelRow { - public ushort ScriptRewardAmount; - public uint ExpReward; - public ushort Points; + public ushort ScriptRewardAmount { get; set; } + public uint ExpReward { get; set; } + public ushort Points { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); ScriptRewardAmount = parser.ReadColumn< ushort >( 0 ); ExpReward = parser.ReadColumn< uint >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/HWDCrafterSupplyTerm.cs b/src/Lumina.Excel/GeneratedSheets/HWDCrafterSupplyTerm.cs index 6d63b1fd..1faf3b7e 100644 --- a/src/Lumina.Excel/GeneratedSheets/HWDCrafterSupplyTerm.cs +++ b/src/Lumina.Excel/GeneratedSheets/HWDCrafterSupplyTerm.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "HWDCrafterSupplyTerm", columnHash: 0xdebb20e3 )] - public class HWDCrafterSupplyTerm : IExcelRow + public class HWDCrafterSupplyTerm : ExcelRow { - public SeString Name; + public SeString Name { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/HWDDevLayerControl.cs b/src/Lumina.Excel/GeneratedSheets/HWDDevLayerControl.cs index e06476ec..9703dd6f 100644 --- a/src/Lumina.Excel/GeneratedSheets/HWDDevLayerControl.cs +++ b/src/Lumina.Excel/GeneratedSheets/HWDDevLayerControl.cs @@ -7,19 +7,15 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "HWDDevLayerControl", columnHash: 0xde74b4c4 )] - public class HWDDevLayerControl : IExcelRow + public class HWDDevLayerControl : ExcelRow { - public byte Unknown0; - public byte Unknown1; + public byte Unknown0 { get; set; } + public byte Unknown1 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< byte >( 0 ); Unknown1 = parser.ReadColumn< byte >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/HWDDevLevelUI.cs b/src/Lumina.Excel/GeneratedSheets/HWDDevLevelUI.cs index e460673c..302bdaa4 100644 --- a/src/Lumina.Excel/GeneratedSheets/HWDDevLevelUI.cs +++ b/src/Lumina.Excel/GeneratedSheets/HWDDevLevelUI.cs @@ -7,19 +7,15 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "HWDDevLevelUI", columnHash: 0xd73eab80 )] - public class HWDDevLevelUI : IExcelRow + public class HWDDevLevelUI : ExcelRow { - public byte Unknown0; - public ushort Unknown1; + public byte Unknown0 { get; set; } + public ushort Unknown1 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< byte >( 0 ); Unknown1 = parser.ReadColumn< ushort >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/HWDDevLively.cs b/src/Lumina.Excel/GeneratedSheets/HWDDevLively.cs index e5930c8f..2f7936a7 100644 --- a/src/Lumina.Excel/GeneratedSheets/HWDDevLively.cs +++ b/src/Lumina.Excel/GeneratedSheets/HWDDevLively.cs @@ -7,22 +7,18 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "HWDDevLively", columnHash: 0xe18cbe18 )] - public class HWDDevLively : IExcelRow + public class HWDDevLively : ExcelRow { - public LazyRow< ENpcBase > ENPC; - public ushort Unknown1; - public byte Unknown2; + public LazyRow< ENpcBase > ENPC { get; set; } + public ushort Unknown1 { get; set; } + public byte Unknown2 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - ENPC = new LazyRow< ENpcBase >( lumina, parser.ReadColumn< uint >( 0 ), language ); + ENPC = new LazyRow< ENpcBase >( gameData, parser.ReadColumn< uint >( 0 ), language ); Unknown1 = parser.ReadColumn< ushort >( 1 ); Unknown2 = parser.ReadColumn< byte >( 2 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/HWDDevProgress.cs b/src/Lumina.Excel/GeneratedSheets/HWDDevProgress.cs index e9e5df1f..1fcef2b1 100644 --- a/src/Lumina.Excel/GeneratedSheets/HWDDevProgress.cs +++ b/src/Lumina.Excel/GeneratedSheets/HWDDevProgress.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "HWDDevProgress", columnHash: 0xcd4cb81c )] - public class HWDDevProgress : IExcelRow + public class HWDDevProgress : ExcelRow { - public bool CanGoNext; + public bool CanGoNext { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); CanGoNext = parser.ReadColumn< bool >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/HWDGathereInspectTerm.cs b/src/Lumina.Excel/GeneratedSheets/HWDGathereInspectTerm.cs index 4db3f407..02fb2c86 100644 --- a/src/Lumina.Excel/GeneratedSheets/HWDGathereInspectTerm.cs +++ b/src/Lumina.Excel/GeneratedSheets/HWDGathereInspectTerm.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "HWDGathereInspectTerm", columnHash: 0xdebb20e3 )] - public class HWDGathereInspectTerm : IExcelRow + public class HWDGathereInspectTerm : ExcelRow { - public SeString Name; + public SeString Name { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/HWDGathererInspection.cs b/src/Lumina.Excel/GeneratedSheets/HWDGathererInspection.cs index 1900aefd..f61f44fd 100644 --- a/src/Lumina.Excel/GeneratedSheets/HWDGathererInspection.cs +++ b/src/Lumina.Excel/GeneratedSheets/HWDGathererInspection.cs @@ -7,46 +7,42 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "HWDGathererInspection", columnHash: 0xad239733 )] - public class HWDGathererInspection : IExcelRow + public class HWDGathererInspection : ExcelRow { - public LazyRow< GatheringItem >[] ItemRequired; - public LazyRow< FishParameter >[] FishParameter; - public byte[] AmountRequired; - public LazyRow< Item >[] ItemReceived; - public LazyRow< HWDGathererInspectionReward >[] Reward1; - public LazyRow< HWDGathererInspectionReward >[] Reward2; - public LazyRow< HWDGathereInspectTerm >[] Phase; + public LazyRow< GatheringItem >[] ItemRequired { get; set; } + public LazyRow< FishParameter >[] FishParameter { get; set; } + public byte[] AmountRequired { get; set; } + public LazyRow< Item >[] ItemReceived { get; set; } + public LazyRow< HWDGathererInspectionReward >[] Reward1 { get; set; } + public LazyRow< HWDGathererInspectionReward >[] Reward2 { get; set; } + public LazyRow< HWDGathereInspectTerm >[] Phase { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); ItemRequired = new LazyRow< GatheringItem >[ 79 ]; for( var i = 0; i < 79; i++ ) - ItemRequired[ i ] = new LazyRow< GatheringItem >( lumina, parser.ReadColumn< uint >( 0 + i ), language ); + ItemRequired[ i ] = new LazyRow< GatheringItem >( gameData, parser.ReadColumn< uint >( 0 + i ), language ); FishParameter = new LazyRow< FishParameter >[ 79 ]; for( var i = 0; i < 79; i++ ) - FishParameter[ i ] = new LazyRow< FishParameter >( lumina, parser.ReadColumn< uint >( 79 + i ), language ); + FishParameter[ i ] = new LazyRow< FishParameter >( gameData, parser.ReadColumn< uint >( 79 + i ), language ); AmountRequired = new byte[ 79 ]; for( var i = 0; i < 79; i++ ) AmountRequired[ i ] = parser.ReadColumn< byte >( 158 + i ); ItemReceived = new LazyRow< Item >[ 79 ]; for( var i = 0; i < 79; i++ ) - ItemReceived[ i ] = new LazyRow< Item >( lumina, parser.ReadColumn< uint >( 237 + i ), language ); + ItemReceived[ i ] = new LazyRow< Item >( gameData, parser.ReadColumn< uint >( 237 + i ), language ); Reward1 = new LazyRow< HWDGathererInspectionReward >[ 79 ]; for( var i = 0; i < 79; i++ ) - Reward1[ i ] = new LazyRow< HWDGathererInspectionReward >( lumina, parser.ReadColumn< ushort >( 316 + i ), language ); + Reward1[ i ] = new LazyRow< HWDGathererInspectionReward >( gameData, parser.ReadColumn< ushort >( 316 + i ), language ); Reward2 = new LazyRow< HWDGathererInspectionReward >[ 79 ]; for( var i = 0; i < 79; i++ ) - Reward2[ i ] = new LazyRow< HWDGathererInspectionReward >( lumina, parser.ReadColumn< ushort >( 395 + i ), language ); + Reward2[ i ] = new LazyRow< HWDGathererInspectionReward >( gameData, parser.ReadColumn< ushort >( 395 + i ), language ); Phase = new LazyRow< HWDGathereInspectTerm >[ 79 ]; for( var i = 0; i < 79; i++ ) - Phase[ i ] = new LazyRow< HWDGathereInspectTerm >( lumina, parser.ReadColumn< byte >( 474 + i ), language ); + Phase[ i ] = new LazyRow< HWDGathereInspectTerm >( gameData, parser.ReadColumn< byte >( 474 + i ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/HWDGathererInspectionReward.cs b/src/Lumina.Excel/GeneratedSheets/HWDGathererInspectionReward.cs index bd7e0dfd..a3015a55 100644 --- a/src/Lumina.Excel/GeneratedSheets/HWDGathererInspectionReward.cs +++ b/src/Lumina.Excel/GeneratedSheets/HWDGathererInspectionReward.cs @@ -7,19 +7,15 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "HWDGathererInspectionReward", columnHash: 0x2020acf6 )] - public class HWDGathererInspectionReward : IExcelRow + public class HWDGathererInspectionReward : ExcelRow { - public ushort Scrips; - public ushort Points; + public ushort Scrips { get; set; } + public ushort Points { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Scrips = parser.ReadColumn< ushort >( 0 ); Points = parser.ReadColumn< ushort >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/HWDInfoBoardArticle.cs b/src/Lumina.Excel/GeneratedSheets/HWDInfoBoardArticle.cs index ac22d8a2..fe007c67 100644 --- a/src/Lumina.Excel/GeneratedSheets/HWDInfoBoardArticle.cs +++ b/src/Lumina.Excel/GeneratedSheets/HWDInfoBoardArticle.cs @@ -7,24 +7,20 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "HWDInfoBoardArticle", columnHash: 0x76cb5660 )] - public class HWDInfoBoardArticle : IExcelRow + public class HWDInfoBoardArticle : ExcelRow { - public LazyRow< HWDInfoBoardArticleType > Type; - public byte Unknown1; - public ushort Unknown2; - public bool Unknown3; - public SeString Text; + public LazyRow< HWDInfoBoardArticleType > Type { get; set; } + public byte Unknown1 { get; set; } + public ushort Unknown2 { get; set; } + public bool Unknown3 { get; set; } + public SeString Text { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Type = new LazyRow< HWDInfoBoardArticleType >( lumina, parser.ReadColumn< byte >( 0 ), language ); + Type = new LazyRow< HWDInfoBoardArticleType >( gameData, parser.ReadColumn< byte >( 0 ), language ); Unknown1 = parser.ReadColumn< byte >( 1 ); Unknown2 = parser.ReadColumn< ushort >( 2 ); Unknown3 = parser.ReadColumn< bool >( 3 ); diff --git a/src/Lumina.Excel/GeneratedSheets/HWDInfoBoardArticleTransient.cs b/src/Lumina.Excel/GeneratedSheets/HWDInfoBoardArticleTransient.cs index 22b44e22..9932dbe2 100644 --- a/src/Lumina.Excel/GeneratedSheets/HWDInfoBoardArticleTransient.cs +++ b/src/Lumina.Excel/GeneratedSheets/HWDInfoBoardArticleTransient.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "HWDInfoBoardArticleTransient", columnHash: 0x11a44a12 )] - public class HWDInfoBoardArticleTransient : IExcelRow + public class HWDInfoBoardArticleTransient : ExcelRow { - public uint Image; - public SeString Text; - public SeString NpcName; + public uint Image { get; set; } + public SeString Text { get; set; } + public SeString NpcName { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Image = parser.ReadColumn< uint >( 0 ); Text = parser.ReadColumn< SeString >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/HWDInfoBoardArticleType.cs b/src/Lumina.Excel/GeneratedSheets/HWDInfoBoardArticleType.cs index b3692ec1..9ccc99e3 100644 --- a/src/Lumina.Excel/GeneratedSheets/HWDInfoBoardArticleType.cs +++ b/src/Lumina.Excel/GeneratedSheets/HWDInfoBoardArticleType.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "HWDInfoBoardArticleType", columnHash: 0xdebb20e3 )] - public class HWDInfoBoardArticleType : IExcelRow + public class HWDInfoBoardArticleType : ExcelRow { - public SeString Type; + public SeString Type { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Type = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/HWDLevelChangeDeception.cs b/src/Lumina.Excel/GeneratedSheets/HWDLevelChangeDeception.cs index c144e43c..b27107d6 100644 --- a/src/Lumina.Excel/GeneratedSheets/HWDLevelChangeDeception.cs +++ b/src/Lumina.Excel/GeneratedSheets/HWDLevelChangeDeception.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "HWDLevelChangeDeception", columnHash: 0xda365c51 )] - public class HWDLevelChangeDeception : IExcelRow + public class HWDLevelChangeDeception : ExcelRow { - public LazyRow< ScreenImage > Image; + public LazyRow< ScreenImage > Image { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Image = new LazyRow< ScreenImage >( lumina, parser.ReadColumn< int >( 0 ), language ); + Image = new LazyRow< ScreenImage >( gameData, parser.ReadColumn< int >( 0 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/HWDSharedGroup.cs b/src/Lumina.Excel/GeneratedSheets/HWDSharedGroup.cs index 8190fab9..1edd5b8b 100644 --- a/src/Lumina.Excel/GeneratedSheets/HWDSharedGroup.cs +++ b/src/Lumina.Excel/GeneratedSheets/HWDSharedGroup.cs @@ -7,22 +7,18 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "HWDSharedGroup", columnHash: 0x5a516458 )] - public class HWDSharedGroup : IExcelRow + public class HWDSharedGroup : ExcelRow { - public uint LGB; - public LazyRow< HWDSharedGroupControlParam > Param; + public uint LGB { get; set; } + public LazyRow< HWDSharedGroupControlParam > Param { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); LGB = parser.ReadColumn< uint >( 0 ); - Param = new LazyRow< HWDSharedGroupControlParam >( lumina, parser.ReadColumn< byte >( 1 ), language ); + Param = new LazyRow< HWDSharedGroupControlParam >( gameData, parser.ReadColumn< byte >( 1 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/HWDSharedGroupControlParam.cs b/src/Lumina.Excel/GeneratedSheets/HWDSharedGroupControlParam.cs index 04b6b8ab..3ff4f367 100644 --- a/src/Lumina.Excel/GeneratedSheets/HWDSharedGroupControlParam.cs +++ b/src/Lumina.Excel/GeneratedSheets/HWDSharedGroupControlParam.cs @@ -7,19 +7,15 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "HWDSharedGroupControlParam", columnHash: 0xde74b4c4 )] - public class HWDSharedGroupControlParam : IExcelRow + public class HWDSharedGroupControlParam : ExcelRow { - public byte Unknown0; - public byte ParamValue; + public byte Unknown0 { get; set; } + public byte ParamValue { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< byte >( 0 ); ParamValue = parser.ReadColumn< byte >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/HairMakeType.cs b/src/Lumina.Excel/GeneratedSheets/HairMakeType.cs index f4a0d562..211b4ac0 100644 --- a/src/Lumina.Excel/GeneratedSheets/HairMakeType.cs +++ b/src/Lumina.Excel/GeneratedSheets/HairMakeType.cs @@ -7,1132 +7,1128 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "HairMakeType", columnHash: 0x12b0d41a )] - public class HairMakeType : IExcelRow + public class HairMakeType : ExcelRow { - public LazyRow< Race > Race; - public LazyRow< Tribe > Tribe; - public sbyte Gender; - public uint Unknown3; - public uint Unknown4; - public uint Unknown5; - public uint Unknown6; - public uint Unknown7; - public uint Unknown8; - public uint Unknown9; - public uint Unknown10; - public uint Unknown11; - public byte Unknown12; - public byte Unknown13; - public byte Unknown14; - public byte Unknown15; - public byte Unknown16; - public byte Unknown17; - public byte Unknown18; - public byte Unknown19; - public byte Unknown20; - public byte Unknown21; - public byte Unknown22; - public byte Unknown23; - public byte Unknown24; - public byte Unknown25; - public byte Unknown26; - public byte Unknown27; - public byte Unknown28; - public byte Unknown29; - public byte Unknown30; - public byte Unknown31; - public byte Unknown32; - public byte Unknown33; - public byte Unknown34; - public byte Unknown35; - public byte Unknown36; - public byte Unknown37; - public byte Unknown38; - public byte Unknown39; - public byte Unknown40; - public byte Unknown41; - public byte Unknown42; - public byte Unknown43; - public byte Unknown44; - public byte Unknown45; - public byte Unknown46; - public byte Unknown47; - public uint Unknown48; - public uint Unknown49; - public uint Unknown50; - public uint Unknown51; - public uint Unknown52; - public uint Unknown53; - public uint Unknown54; - public uint Unknown55; - public uint Unknown56; - public uint Unknown57; - public uint Unknown58; - public uint Unknown59; - public uint Unknown60; - public uint Unknown61; - public uint Unknown62; - public uint Unknown63; - public uint Unknown64; - public uint Unknown65; - public uint Unknown66; - public uint Unknown67; - public uint Unknown68; - public uint Unknown69; - public uint Unknown70; - public uint Unknown71; - public uint Unknown72; - public uint Unknown73; - public uint Unknown74; - public uint Unknown75; - public uint Unknown76; - public uint Unknown77; - public uint Unknown78; - public uint Unknown79; - public uint Unknown80; - public uint Unknown81; - public uint Unknown82; - public uint Unknown83; - public uint Unknown84; - public uint Unknown85; - public uint Unknown86; - public uint Unknown87; - public uint Unknown88; - public uint Unknown89; - public uint Unknown90; - public uint Unknown91; - public uint Unknown92; - public uint Unknown93; - public uint Unknown94; - public uint Unknown95; - public uint Unknown96; - public uint Unknown97; - public uint Unknown98; - public uint Unknown99; - public uint Unknown100; - public uint Unknown101; - public uint Unknown102; - public uint Unknown103; - public uint Unknown104; - public uint Unknown105; - public uint Unknown106; - public uint Unknown107; - public uint Unknown108; - public uint Unknown109; - public uint Unknown110; - public uint Unknown111; - public uint Unknown112; - public uint Unknown113; - public uint Unknown114; - public uint Unknown115; - public uint Unknown116; - public uint Unknown117; - public uint Unknown118; - public uint Unknown119; - public uint Unknown120; - public uint Unknown121; - public uint Unknown122; - public uint Unknown123; - public uint Unknown124; - public uint Unknown125; - public uint Unknown126; - public uint Unknown127; - public uint Unknown128; - public uint Unknown129; - public uint Unknown130; - public uint Unknown131; - public uint Unknown132; - public uint Unknown133; - public uint Unknown134; - public uint Unknown135; - public uint Unknown136; - public uint Unknown137; - public uint Unknown138; - public uint Unknown139; - public uint Unknown140; - public uint Unknown141; - public uint Unknown142; - public uint Unknown143; - public uint Unknown144; - public uint Unknown145; - public uint Unknown146; - public uint Unknown147; - public uint Unknown148; - public uint Unknown149; - public uint Unknown150; - public uint Unknown151; - public uint Unknown152; - public uint Unknown153; - public uint Unknown154; - public uint Unknown155; - public uint Unknown156; - public uint Unknown157; - public uint Unknown158; - public uint Unknown159; - public uint Unknown160; - public uint Unknown161; - public uint Unknown162; - public uint Unknown163; - public uint Unknown164; - public uint Unknown165; - public uint Unknown166; - public uint Unknown167; - public uint Unknown168; - public uint Unknown169; - public uint Unknown170; - public uint Unknown171; - public uint Unknown172; - public uint Unknown173; - public uint Unknown174; - public uint Unknown175; - public uint Unknown176; - public uint Unknown177; - public uint Unknown178; - public uint Unknown179; - public uint Unknown180; - public uint Unknown181; - public uint Unknown182; - public uint Unknown183; - public uint Unknown184; - public uint Unknown185; - public uint Unknown186; - public uint Unknown187; - public uint Unknown188; - public uint Unknown189; - public uint Unknown190; - public uint Unknown191; - public uint Unknown192; - public uint Unknown193; - public uint Unknown194; - public uint Unknown195; - public uint Unknown196; - public uint Unknown197; - public uint Unknown198; - public uint Unknown199; - public uint Unknown200; - public uint Unknown201; - public uint Unknown202; - public uint Unknown203; - public uint Unknown204; - public uint Unknown205; - public uint Unknown206; - public uint Unknown207; - public uint Unknown208; - public uint Unknown209; - public uint Unknown210; - public uint Unknown211; - public uint Unknown212; - public uint Unknown213; - public uint Unknown214; - public uint Unknown215; - public uint Unknown216; - public uint Unknown217; - public uint Unknown218; - public uint Unknown219; - public uint Unknown220; - public uint Unknown221; - public uint Unknown222; - public uint Unknown223; - public uint Unknown224; - public uint Unknown225; - public uint Unknown226; - public uint Unknown227; - public uint Unknown228; - public uint Unknown229; - public uint Unknown230; - public uint Unknown231; - public uint Unknown232; - public uint Unknown233; - public uint Unknown234; - public uint Unknown235; - public uint Unknown236; - public uint Unknown237; - public uint Unknown238; - public uint Unknown239; - public uint Unknown240; - public uint Unknown241; - public uint Unknown242; - public uint Unknown243; - public uint Unknown244; - public uint Unknown245; - public uint Unknown246; - public uint Unknown247; - public uint Unknown248; - public uint Unknown249; - public uint Unknown250; - public uint Unknown251; - public uint Unknown252; - public uint Unknown253; - public uint Unknown254; - public uint Unknown255; - public uint Unknown256; - public uint Unknown257; - public uint Unknown258; - public uint Unknown259; - public uint Unknown260; - public uint Unknown261; - public uint Unknown262; - public uint Unknown263; - public uint Unknown264; - public uint Unknown265; - public uint Unknown266; - public uint Unknown267; - public uint Unknown268; - public uint Unknown269; - public uint Unknown270; - public uint Unknown271; - public uint Unknown272; - public uint Unknown273; - public uint Unknown274; - public uint Unknown275; - public uint Unknown276; - public uint Unknown277; - public uint Unknown278; - public uint Unknown279; - public uint Unknown280; - public uint Unknown281; - public uint Unknown282; - public uint Unknown283; - public uint Unknown284; - public uint Unknown285; - public uint Unknown286; - public uint Unknown287; - public uint Unknown288; - public uint Unknown289; - public uint Unknown290; - public uint Unknown291; - public uint Unknown292; - public uint Unknown293; - public uint Unknown294; - public uint Unknown295; - public uint Unknown296; - public uint Unknown297; - public uint Unknown298; - public uint Unknown299; - public uint Unknown300; - public uint Unknown301; - public uint Unknown302; - public uint Unknown303; - public uint Unknown304; - public uint Unknown305; - public uint Unknown306; - public uint Unknown307; - public uint Unknown308; - public uint Unknown309; - public uint Unknown310; - public uint Unknown311; - public uint Unknown312; - public uint Unknown313; - public uint Unknown314; - public uint Unknown315; - public uint Unknown316; - public uint Unknown317; - public uint Unknown318; - public uint Unknown319; - public uint Unknown320; - public uint Unknown321; - public uint Unknown322; - public uint Unknown323; - public uint Unknown324; - public uint Unknown325; - public uint Unknown326; - public uint Unknown327; - public uint Unknown328; - public uint Unknown329; - public uint Unknown330; - public uint Unknown331; - public uint Unknown332; - public uint Unknown333; - public uint Unknown334; - public uint Unknown335; - public uint Unknown336; - public uint Unknown337; - public uint Unknown338; - public uint Unknown339; - public uint Unknown340; - public uint Unknown341; - public uint Unknown342; - public uint Unknown343; - public uint Unknown344; - public uint Unknown345; - public uint Unknown346; - public uint Unknown347; - public uint Unknown348; - public uint Unknown349; - public uint Unknown350; - public uint Unknown351; - public uint Unknown352; - public uint Unknown353; - public uint Unknown354; - public uint Unknown355; - public uint Unknown356; - public uint Unknown357; - public uint Unknown358; - public uint Unknown359; - public uint Unknown360; - public uint Unknown361; - public uint Unknown362; - public uint Unknown363; - public uint Unknown364; - public uint Unknown365; - public uint Unknown366; - public uint Unknown367; - public uint Unknown368; - public uint Unknown369; - public uint Unknown370; - public uint Unknown371; - public uint Unknown372; - public uint Unknown373; - public uint Unknown374; - public uint Unknown375; - public uint Unknown376; - public uint Unknown377; - public uint Unknown378; - public uint Unknown379; - public uint Unknown380; - public uint Unknown381; - public uint Unknown382; - public uint Unknown383; - public uint Unknown384; - public uint Unknown385; - public uint Unknown386; - public uint Unknown387; - public uint Unknown388; - public uint Unknown389; - public uint Unknown390; - public uint Unknown391; - public uint Unknown392; - public uint Unknown393; - public uint Unknown394; - public uint Unknown395; - public uint Unknown396; - public uint Unknown397; - public uint Unknown398; - public uint Unknown399; - public uint Unknown400; - public uint Unknown401; - public uint Unknown402; - public uint Unknown403; - public uint Unknown404; - public uint Unknown405; - public uint Unknown406; - public uint Unknown407; - public uint Unknown408; - public uint Unknown409; - public uint Unknown410; - public uint Unknown411; - public uint Unknown412; - public uint Unknown413; - public uint Unknown414; - public uint Unknown415; - public uint Unknown416; - public uint Unknown417; - public uint Unknown418; - public uint Unknown419; - public uint Unknown420; - public uint Unknown421; - public uint Unknown422; - public uint Unknown423; - public uint Unknown424; - public uint Unknown425; - public uint Unknown426; - public uint Unknown427; - public uint Unknown428; - public uint Unknown429; - public uint Unknown430; - public uint Unknown431; - public uint Unknown432; - public uint Unknown433; - public uint Unknown434; - public uint Unknown435; - public uint Unknown436; - public uint Unknown437; - public uint Unknown438; - public uint Unknown439; - public uint Unknown440; - public uint Unknown441; - public uint Unknown442; - public uint Unknown443; - public uint Unknown444; - public uint Unknown445; - public uint Unknown446; - public uint Unknown447; - public uint Unknown448; - public uint Unknown449; - public uint Unknown450; - public uint Unknown451; - public uint Unknown452; - public uint Unknown453; - public uint Unknown454; - public uint Unknown455; - public uint Unknown456; - public uint Unknown457; - public uint Unknown458; - public uint Unknown459; - public uint Unknown460; - public uint Unknown461; - public uint Unknown462; - public uint Unknown463; - public uint Unknown464; - public uint Unknown465; - public uint Unknown466; - public uint Unknown467; - public uint Unknown468; - public uint Unknown469; - public uint Unknown470; - public uint Unknown471; - public uint Unknown472; - public uint Unknown473; - public uint Unknown474; - public uint Unknown475; - public uint Unknown476; - public uint Unknown477; - public uint Unknown478; - public uint Unknown479; - public uint Unknown480; - public uint Unknown481; - public uint Unknown482; - public uint Unknown483; - public uint Unknown484; - public uint Unknown485; - public uint Unknown486; - public uint Unknown487; - public uint Unknown488; - public uint Unknown489; - public uint Unknown490; - public uint Unknown491; - public uint Unknown492; - public uint Unknown493; - public uint Unknown494; - public uint Unknown495; - public uint Unknown496; - public uint Unknown497; - public uint Unknown498; - public uint Unknown499; - public uint Unknown500; - public uint Unknown501; - public uint Unknown502; - public uint Unknown503; - public uint Unknown504; - public uint Unknown505; - public uint Unknown506; - public uint Unknown507; - public uint Unknown508; - public uint Unknown509; - public uint Unknown510; - public uint Unknown511; - public uint Unknown512; - public uint Unknown513; - public uint Unknown514; - public uint Unknown515; - public uint Unknown516; - public uint Unknown517; - public uint Unknown518; - public uint Unknown519; - public uint Unknown520; - public uint Unknown521; - public uint Unknown522; - public uint Unknown523; - public uint Unknown524; - public uint Unknown525; - public uint Unknown526; - public uint Unknown527; - public uint Unknown528; - public uint Unknown529; - public uint Unknown530; - public uint Unknown531; - public uint Unknown532; - public uint Unknown533; - public uint Unknown534; - public uint Unknown535; - public uint Unknown536; - public uint Unknown537; - public uint Unknown538; - public uint Unknown539; - public uint Unknown540; - public uint Unknown541; - public uint Unknown542; - public uint Unknown543; - public uint Unknown544; - public uint Unknown545; - public uint Unknown546; - public uint Unknown547; - public uint Unknown548; - public uint Unknown549; - public uint Unknown550; - public uint Unknown551; - public uint Unknown552; - public uint Unknown553; - public uint Unknown554; - public uint Unknown555; - public uint Unknown556; - public uint Unknown557; - public uint Unknown558; - public uint Unknown559; - public uint Unknown560; - public uint Unknown561; - public uint Unknown562; - public uint Unknown563; - public uint Unknown564; - public uint Unknown565; - public uint Unknown566; - public uint Unknown567; - public uint Unknown568; - public uint Unknown569; - public uint Unknown570; - public uint Unknown571; - public uint Unknown572; - public uint Unknown573; - public uint Unknown574; - public uint Unknown575; - public uint Unknown576; - public uint Unknown577; - public uint Unknown578; - public uint Unknown579; - public uint Unknown580; - public uint Unknown581; - public uint Unknown582; - public uint Unknown583; - public uint Unknown584; - public uint Unknown585; - public uint Unknown586; - public uint Unknown587; - public uint Unknown588; - public uint Unknown589; - public uint Unknown590; - public uint Unknown591; - public uint Unknown592; - public uint Unknown593; - public uint Unknown594; - public uint Unknown595; - public uint Unknown596; - public uint Unknown597; - public uint Unknown598; - public uint Unknown599; - public uint Unknown600; - public uint Unknown601; - public uint Unknown602; - public uint Unknown603; - public uint Unknown604; - public uint Unknown605; - public uint Unknown606; - public uint Unknown607; - public uint Unknown608; - public uint Unknown609; - public uint Unknown610; - public uint Unknown611; - public uint Unknown612; - public uint Unknown613; - public uint Unknown614; - public uint Unknown615; - public uint Unknown616; - public uint Unknown617; - public uint Unknown618; - public uint Unknown619; - public uint Unknown620; - public uint Unknown621; - public uint Unknown622; - public uint Unknown623; - public uint Unknown624; - public uint Unknown625; - public uint Unknown626; - public uint Unknown627; - public uint Unknown628; - public uint Unknown629; - public uint Unknown630; - public uint Unknown631; - public uint Unknown632; - public uint Unknown633; - public uint Unknown634; - public uint Unknown635; - public uint Unknown636; - public uint Unknown637; - public uint Unknown638; - public uint Unknown639; - public uint Unknown640; - public uint Unknown641; - public uint Unknown642; - public uint Unknown643; - public uint Unknown644; - public uint Unknown645; - public uint Unknown646; - public uint Unknown647; - public uint Unknown648; - public uint Unknown649; - public uint Unknown650; - public uint Unknown651; - public uint Unknown652; - public uint Unknown653; - public uint Unknown654; - public uint Unknown655; - public uint Unknown656; - public uint Unknown657; - public uint Unknown658; - public uint Unknown659; - public uint Unknown660; - public uint Unknown661; - public uint Unknown662; - public uint Unknown663; - public uint Unknown664; - public uint Unknown665; - public uint Unknown666; - public uint Unknown667; - public uint Unknown668; - public uint Unknown669; - public uint Unknown670; - public uint Unknown671; - public uint Unknown672; - public uint Unknown673; - public uint Unknown674; - public uint Unknown675; - public uint Unknown676; - public uint Unknown677; - public uint Unknown678; - public uint Unknown679; - public uint Unknown680; - public uint Unknown681; - public uint Unknown682; - public uint Unknown683; - public uint Unknown684; - public uint Unknown685; - public uint Unknown686; - public uint Unknown687; - public uint Unknown688; - public uint Unknown689; - public uint Unknown690; - public uint Unknown691; - public uint Unknown692; - public uint Unknown693; - public uint Unknown694; - public uint Unknown695; - public uint Unknown696; - public uint Unknown697; - public uint Unknown698; - public uint Unknown699; - public uint Unknown700; - public uint Unknown701; - public uint Unknown702; - public uint Unknown703; - public uint Unknown704; - public uint Unknown705; - public uint Unknown706; - public uint Unknown707; - public uint Unknown708; - public uint Unknown709; - public uint Unknown710; - public uint Unknown711; - public uint Unknown712; - public uint Unknown713; - public uint Unknown714; - public uint Unknown715; - public uint Unknown716; - public uint Unknown717; - public uint Unknown718; - public uint Unknown719; - public uint Unknown720; - public uint Unknown721; - public uint Unknown722; - public uint Unknown723; - public uint Unknown724; - public uint Unknown725; - public uint Unknown726; - public uint Unknown727; - public uint Unknown728; - public uint Unknown729; - public uint Unknown730; - public uint Unknown731; - public uint Unknown732; - public uint Unknown733; - public uint Unknown734; - public uint Unknown735; - public uint Unknown736; - public uint Unknown737; - public uint Unknown738; - public uint Unknown739; - public uint Unknown740; - public uint Unknown741; - public uint Unknown742; - public uint Unknown743; - public uint Unknown744; - public uint Unknown745; - public uint Unknown746; - public uint Unknown747; - public uint Unknown748; - public uint Unknown749; - public uint Unknown750; - public uint Unknown751; - public uint Unknown752; - public uint Unknown753; - public uint Unknown754; - public uint Unknown755; - public uint Unknown756; - public uint Unknown757; - public uint Unknown758; - public uint Unknown759; - public uint Unknown760; - public uint Unknown761; - public uint Unknown762; - public uint Unknown763; - public uint Unknown764; - public uint Unknown765; - public uint Unknown766; - public uint Unknown767; - public uint Unknown768; - public uint Unknown769; - public uint Unknown770; - public uint Unknown771; - public uint Unknown772; - public uint Unknown773; - public uint Unknown774; - public uint Unknown775; - public uint Unknown776; - public uint Unknown777; - public uint Unknown778; - public uint Unknown779; - public uint Unknown780; - public uint Unknown781; - public uint Unknown782; - public uint Unknown783; - public uint Unknown784; - public uint Unknown785; - public uint Unknown786; - public uint Unknown787; - public uint Unknown788; - public uint Unknown789; - public uint Unknown790; - public uint Unknown791; - public uint Unknown792; - public uint Unknown793; - public uint Unknown794; - public uint Unknown795; - public uint Unknown796; - public uint Unknown797; - public uint Unknown798; - public uint Unknown799; - public uint Unknown800; - public uint Unknown801; - public uint Unknown802; - public uint Unknown803; - public uint Unknown804; - public uint Unknown805; - public uint Unknown806; - public uint Unknown807; - public uint Unknown808; - public uint Unknown809; - public uint Unknown810; - public uint Unknown811; - public uint Unknown812; - public uint Unknown813; - public uint Unknown814; - public uint Unknown815; - public uint Unknown816; - public uint Unknown817; - public uint Unknown818; - public uint Unknown819; - public uint Unknown820; - public uint Unknown821; - public uint Unknown822; - public uint Unknown823; - public uint Unknown824; - public uint Unknown825; - public uint Unknown826; - public uint Unknown827; - public uint Unknown828; - public uint Unknown829; - public uint Unknown830; - public uint Unknown831; - public uint Unknown832; - public uint Unknown833; - public uint Unknown834; - public uint Unknown835; - public uint Unknown836; - public uint Unknown837; - public uint Unknown838; - public uint Unknown839; - public uint Unknown840; - public uint Unknown841; - public uint Unknown842; - public uint Unknown843; - public uint Unknown844; - public uint Unknown845; - public uint Unknown846; - public uint Unknown847; - public uint Unknown848; - public uint Unknown849; - public uint Unknown850; - public uint Unknown851; - public uint Unknown852; - public uint Unknown853; - public uint Unknown854; - public uint Unknown855; - public uint Unknown856; - public uint Unknown857; - public uint Unknown858; - public uint Unknown859; - public uint Unknown860; - public uint Unknown861; - public uint Unknown862; - public uint Unknown863; - public uint Unknown864; - public uint Unknown865; - public uint Unknown866; - public uint Unknown867; - public uint Unknown868; - public uint Unknown869; - public uint Unknown870; - public uint Unknown871; - public uint Unknown872; - public uint Unknown873; - public uint Unknown874; - public uint Unknown875; - public uint Unknown876; - public uint Unknown877; - public uint Unknown878; - public uint Unknown879; - public uint Unknown880; - public uint Unknown881; - public uint Unknown882; - public uint Unknown883; - public uint Unknown884; - public uint Unknown885; - public uint Unknown886; - public uint Unknown887; - public uint Unknown888; - public uint Unknown889; - public uint Unknown890; - public uint Unknown891; - public uint Unknown892; - public uint Unknown893; - public uint Unknown894; - public uint Unknown895; - public uint Unknown896; - public uint Unknown897; - public uint Unknown898; - public uint Unknown899; - public uint Unknown900; - public uint Unknown901; - public uint Unknown902; - public uint Unknown903; - public uint Unknown904; - public uint Unknown905; - public uint Unknown906; - public uint Unknown907; - public uint Unknown908; - public uint Unknown909; - public uint Unknown910; - public uint Unknown911; - public uint Unknown912; - public uint Unknown913; - public uint Unknown914; - public uint Unknown915; - public uint Unknown916; - public uint Unknown917; - public uint Unknown918; - public uint Unknown919; - public uint Unknown920; - public uint Unknown921; - public uint Unknown922; - public uint Unknown923; - public uint Unknown924; - public uint Unknown925; - public uint Unknown926; - public uint Unknown927; - public uint Unknown928; - public uint Unknown929; - public uint Unknown930; - public uint Unknown931; - public uint Unknown932; - public uint Unknown933; - public uint Unknown934; - public uint Unknown935; - public uint Unknown936; - public uint Unknown937; - public uint Unknown938; - public uint Unknown939; - public uint Unknown940; - public uint Unknown941; - public uint Unknown942; - public uint Unknown943; - public uint Unknown944; - public uint Unknown945; - public uint Unknown946; - public uint Unknown947; - public uint Unknown948; - public uint Unknown949; - public uint Unknown950; - public uint Unknown951; - public uint Unknown952; - public uint Unknown953; - public uint Unknown954; - public uint Unknown955; - public uint Unknown956; - public uint Unknown957; - public uint Unknown958; - public uint Unknown959; - public uint Unknown960; - public uint Unknown961; - public uint Unknown962; - public uint Unknown963; - public uint Unknown964; - public uint Unknown965; - public byte Unknown966; - public byte Unknown967; - public byte Unknown968; - public byte Unknown969; - public byte Unknown970; - public byte Unknown971; - public byte Unknown972; - public byte Unknown973; - public byte Unknown974; - public byte Unknown975; - public byte Unknown976; - public byte Unknown977; - public byte Unknown978; - public byte Unknown979; - public byte Unknown980; - public byte Unknown981; - public byte Unknown982; - public byte Unknown983; - public byte Unknown984; - public byte Unknown985; - public byte Unknown986; - public byte Unknown987; - public byte Unknown988; - public byte Unknown989; - public byte Unknown990; - public byte Unknown991; - public byte Unknown992; - public byte Unknown993; - public byte Unknown994; - public byte Unknown995; - public byte Unknown996; - public byte Unknown997; - public byte Unknown998; - public byte Unknown999; - public byte Unknown1000; - public byte Unknown1001; - public byte Unknown1002; - public byte Unknown1003; - public byte Unknown1004; - public byte Unknown1005; - public byte Unknown1006; - public byte Unknown1007; - public byte Unknown1008; - public byte Unknown1009; - public byte Unknown1010; - public byte Unknown1011; - public byte Unknown1012; - public byte Unknown1013; - public byte Unknown1014; - public byte Unknown1015; - public byte Unknown1016; - public byte Unknown1017; - public byte Unknown1018; - public byte Unknown1019; - public byte Unknown1020; - public byte Unknown1021; - public byte Unknown1022; - public byte Unknown1023; - public byte Unknown1024; - public byte Unknown1025; - public byte Unknown1026; - public byte Unknown1027; - public byte Unknown1028; - public byte Unknown1029; - public byte Unknown1030; - public byte Unknown1031; - public byte Unknown1032; - public byte Unknown1033; - public byte Unknown1034; - public byte Unknown1035; - public byte Unknown1036; - public byte Unknown1037; - public byte Unknown1038; - public byte Unknown1039; - public byte Unknown1040; - public byte Unknown1041; - public byte Unknown1042; - public byte Unknown1043; - public byte Unknown1044; - public byte Unknown1045; - public byte Unknown1046; - public byte Unknown1047; - public byte Unknown1048; - public byte Unknown1049; - public byte Unknown1050; - public byte Unknown1051; - public byte Unknown1052; - public byte Unknown1053; - public byte Unknown1054; - public byte Unknown1055; - public int Unknown1056; - public int Unknown1057; - public int Unknown1058; - public int Unknown1059; - public int Unknown1060; - public int Unknown1061; - public int Unknown1062; - public int Unknown1063; - public int Unknown1064; - public int Unknown1065; - public int Unknown1066; - public int Unknown1067; - public int Unknown1068; - public int Unknown1069; - public int Unknown1070; - public int Unknown1071; - public int Unknown1072; - public int Unknown1073; - public int Unknown1074; - public int Unknown1075; - public int Unknown1076; - public int Unknown1077; - public int Unknown1078; - public int Unknown1079; - public int Unknown1080; - public int Unknown1081; - public int Unknown1082; - public int Unknown1083; - public int Unknown1084; - public int Unknown1085; - public int Unknown1086; - public int Unknown1087; - public int Unknown1088; - public int Unknown1089; - public int Unknown1090; - public int Unknown1091; - public int Unknown1092; - public int Unknown1093; - public int Unknown1094; - public int Unknown1095; - public int Unknown1096; - public int Unknown1097; - public int Unknown1098; - public int Unknown1099; - public int Unknown1100; - public int Unknown1101; - public int Unknown1102; - public int Unknown1103; - public int Unknown1104; - public int Unknown1105; - public int Unknown1106; - public int Unknown1107; - public int Unknown1108; - public int Unknown1109; - public int Unknown1110; - public int Unknown1111; + public LazyRow< Race > Race { get; set; } + public LazyRow< Tribe > Tribe { get; set; } + public sbyte Gender { get; set; } + public uint Unknown3 { get; set; } + public uint Unknown4 { get; set; } + public uint Unknown5 { get; set; } + public uint Unknown6 { get; set; } + public uint Unknown7 { get; set; } + public uint Unknown8 { get; set; } + public uint Unknown9 { get; set; } + public uint Unknown10 { get; set; } + public uint Unknown11 { get; set; } + public byte Unknown12 { get; set; } + public byte Unknown13 { get; set; } + public byte Unknown14 { get; set; } + public byte Unknown15 { get; set; } + public byte Unknown16 { get; set; } + public byte Unknown17 { get; set; } + public byte Unknown18 { get; set; } + public byte Unknown19 { get; set; } + public byte Unknown20 { get; set; } + public byte Unknown21 { get; set; } + public byte Unknown22 { get; set; } + public byte Unknown23 { get; set; } + public byte Unknown24 { get; set; } + public byte Unknown25 { get; set; } + public byte Unknown26 { get; set; } + public byte Unknown27 { get; set; } + public byte Unknown28 { get; set; } + public byte Unknown29 { get; set; } + public byte Unknown30 { get; set; } + public byte Unknown31 { get; set; } + public byte Unknown32 { get; set; } + public byte Unknown33 { get; set; } + public byte Unknown34 { get; set; } + public byte Unknown35 { get; set; } + public byte Unknown36 { get; set; } + public byte Unknown37 { get; set; } + public byte Unknown38 { get; set; } + public byte Unknown39 { get; set; } + public byte Unknown40 { get; set; } + public byte Unknown41 { get; set; } + public byte Unknown42 { get; set; } + public byte Unknown43 { get; set; } + public byte Unknown44 { get; set; } + public byte Unknown45 { get; set; } + public byte Unknown46 { get; set; } + public byte Unknown47 { get; set; } + public uint Unknown48 { get; set; } + public uint Unknown49 { get; set; } + public uint Unknown50 { get; set; } + public uint Unknown51 { get; set; } + public uint Unknown52 { get; set; } + public uint Unknown53 { get; set; } + public uint Unknown54 { get; set; } + public uint Unknown55 { get; set; } + public uint Unknown56 { get; set; } + public uint Unknown57 { get; set; } + public uint Unknown58 { get; set; } + public uint Unknown59 { get; set; } + public uint Unknown60 { get; set; } + public uint Unknown61 { get; set; } + public uint Unknown62 { get; set; } + public uint Unknown63 { get; set; } + public uint Unknown64 { get; set; } + public uint Unknown65 { get; set; } + public uint Unknown66 { get; set; } + public uint Unknown67 { get; set; } + public uint Unknown68 { get; set; } + public uint Unknown69 { get; set; } + public uint Unknown70 { get; set; } + public uint Unknown71 { get; set; } + public uint Unknown72 { get; set; } + public uint Unknown73 { get; set; } + public uint Unknown74 { get; set; } + public uint Unknown75 { get; set; } + public uint Unknown76 { get; set; } + public uint Unknown77 { get; set; } + public uint Unknown78 { get; set; } + public uint Unknown79 { get; set; } + public uint Unknown80 { get; set; } + public uint Unknown81 { get; set; } + public uint Unknown82 { get; set; } + public uint Unknown83 { get; set; } + public uint Unknown84 { get; set; } + public uint Unknown85 { get; set; } + public uint Unknown86 { get; set; } + public uint Unknown87 { get; set; } + public uint Unknown88 { get; set; } + public uint Unknown89 { get; set; } + public uint Unknown90 { get; set; } + public uint Unknown91 { get; set; } + public uint Unknown92 { get; set; } + public uint Unknown93 { get; set; } + public uint Unknown94 { get; set; } + public uint Unknown95 { get; set; } + public uint Unknown96 { get; set; } + public uint Unknown97 { get; set; } + public uint Unknown98 { get; set; } + public uint Unknown99 { get; set; } + public uint Unknown100 { get; set; } + public uint Unknown101 { get; set; } + public uint Unknown102 { get; set; } + public uint Unknown103 { get; set; } + public uint Unknown104 { get; set; } + public uint Unknown105 { get; set; } + public uint Unknown106 { get; set; } + public uint Unknown107 { get; set; } + public uint Unknown108 { get; set; } + public uint Unknown109 { get; set; } + public uint Unknown110 { get; set; } + public uint Unknown111 { get; set; } + public uint Unknown112 { get; set; } + public uint Unknown113 { get; set; } + public uint Unknown114 { get; set; } + public uint Unknown115 { get; set; } + public uint Unknown116 { get; set; } + public uint Unknown117 { get; set; } + public uint Unknown118 { get; set; } + public uint Unknown119 { get; set; } + public uint Unknown120 { get; set; } + public uint Unknown121 { get; set; } + public uint Unknown122 { get; set; } + public uint Unknown123 { get; set; } + public uint Unknown124 { get; set; } + public uint Unknown125 { get; set; } + public uint Unknown126 { get; set; } + public uint Unknown127 { get; set; } + public uint Unknown128 { get; set; } + public uint Unknown129 { get; set; } + public uint Unknown130 { get; set; } + public uint Unknown131 { get; set; } + public uint Unknown132 { get; set; } + public uint Unknown133 { get; set; } + public uint Unknown134 { get; set; } + public uint Unknown135 { get; set; } + public uint Unknown136 { get; set; } + public uint Unknown137 { get; set; } + public uint Unknown138 { get; set; } + public uint Unknown139 { get; set; } + public uint Unknown140 { get; set; } + public uint Unknown141 { get; set; } + public uint Unknown142 { get; set; } + public uint Unknown143 { get; set; } + public uint Unknown144 { get; set; } + public uint Unknown145 { get; set; } + public uint Unknown146 { get; set; } + public uint Unknown147 { get; set; } + public uint Unknown148 { get; set; } + public uint Unknown149 { get; set; } + public uint Unknown150 { get; set; } + public uint Unknown151 { get; set; } + public uint Unknown152 { get; set; } + public uint Unknown153 { get; set; } + public uint Unknown154 { get; set; } + public uint Unknown155 { get; set; } + public uint Unknown156 { get; set; } + public uint Unknown157 { get; set; } + public uint Unknown158 { get; set; } + public uint Unknown159 { get; set; } + public uint Unknown160 { get; set; } + public uint Unknown161 { get; set; } + public uint Unknown162 { get; set; } + public uint Unknown163 { get; set; } + public uint Unknown164 { get; set; } + public uint Unknown165 { get; set; } + public uint Unknown166 { get; set; } + public uint Unknown167 { get; set; } + public uint Unknown168 { get; set; } + public uint Unknown169 { get; set; } + public uint Unknown170 { get; set; } + public uint Unknown171 { get; set; } + public uint Unknown172 { get; set; } + public uint Unknown173 { get; set; } + public uint Unknown174 { get; set; } + public uint Unknown175 { get; set; } + public uint Unknown176 { get; set; } + public uint Unknown177 { get; set; } + public uint Unknown178 { get; set; } + public uint Unknown179 { get; set; } + public uint Unknown180 { get; set; } + public uint Unknown181 { get; set; } + public uint Unknown182 { get; set; } + public uint Unknown183 { get; set; } + public uint Unknown184 { get; set; } + public uint Unknown185 { get; set; } + public uint Unknown186 { get; set; } + public uint Unknown187 { get; set; } + public uint Unknown188 { get; set; } + public uint Unknown189 { get; set; } + public uint Unknown190 { get; set; } + public uint Unknown191 { get; set; } + public uint Unknown192 { get; set; } + public uint Unknown193 { get; set; } + public uint Unknown194 { get; set; } + public uint Unknown195 { get; set; } + public uint Unknown196 { get; set; } + public uint Unknown197 { get; set; } + public uint Unknown198 { get; set; } + public uint Unknown199 { get; set; } + public uint Unknown200 { get; set; } + public uint Unknown201 { get; set; } + public uint Unknown202 { get; set; } + public uint Unknown203 { get; set; } + public uint Unknown204 { get; set; } + public uint Unknown205 { get; set; } + public uint Unknown206 { get; set; } + public uint Unknown207 { get; set; } + public uint Unknown208 { get; set; } + public uint Unknown209 { get; set; } + public uint Unknown210 { get; set; } + public uint Unknown211 { get; set; } + public uint Unknown212 { get; set; } + public uint Unknown213 { get; set; } + public uint Unknown214 { get; set; } + public uint Unknown215 { get; set; } + public uint Unknown216 { get; set; } + public uint Unknown217 { get; set; } + public uint Unknown218 { get; set; } + public uint Unknown219 { get; set; } + public uint Unknown220 { get; set; } + public uint Unknown221 { get; set; } + public uint Unknown222 { get; set; } + public uint Unknown223 { get; set; } + public uint Unknown224 { get; set; } + public uint Unknown225 { get; set; } + public uint Unknown226 { get; set; } + public uint Unknown227 { get; set; } + public uint Unknown228 { get; set; } + public uint Unknown229 { get; set; } + public uint Unknown230 { get; set; } + public uint Unknown231 { get; set; } + public uint Unknown232 { get; set; } + public uint Unknown233 { get; set; } + public uint Unknown234 { get; set; } + public uint Unknown235 { get; set; } + public uint Unknown236 { get; set; } + public uint Unknown237 { get; set; } + public uint Unknown238 { get; set; } + public uint Unknown239 { get; set; } + public uint Unknown240 { get; set; } + public uint Unknown241 { get; set; } + public uint Unknown242 { get; set; } + public uint Unknown243 { get; set; } + public uint Unknown244 { get; set; } + public uint Unknown245 { get; set; } + public uint Unknown246 { get; set; } + public uint Unknown247 { get; set; } + public uint Unknown248 { get; set; } + public uint Unknown249 { get; set; } + public uint Unknown250 { get; set; } + public uint Unknown251 { get; set; } + public uint Unknown252 { get; set; } + public uint Unknown253 { get; set; } + public uint Unknown254 { get; set; } + public uint Unknown255 { get; set; } + public uint Unknown256 { get; set; } + public uint Unknown257 { get; set; } + public uint Unknown258 { get; set; } + public uint Unknown259 { get; set; } + public uint Unknown260 { get; set; } + public uint Unknown261 { get; set; } + public uint Unknown262 { get; set; } + public uint Unknown263 { get; set; } + public uint Unknown264 { get; set; } + public uint Unknown265 { get; set; } + public uint Unknown266 { get; set; } + public uint Unknown267 { get; set; } + public uint Unknown268 { get; set; } + public uint Unknown269 { get; set; } + public uint Unknown270 { get; set; } + public uint Unknown271 { get; set; } + public uint Unknown272 { get; set; } + public uint Unknown273 { get; set; } + public uint Unknown274 { get; set; } + public uint Unknown275 { get; set; } + public uint Unknown276 { get; set; } + public uint Unknown277 { get; set; } + public uint Unknown278 { get; set; } + public uint Unknown279 { get; set; } + public uint Unknown280 { get; set; } + public uint Unknown281 { get; set; } + public uint Unknown282 { get; set; } + public uint Unknown283 { get; set; } + public uint Unknown284 { get; set; } + public uint Unknown285 { get; set; } + public uint Unknown286 { get; set; } + public uint Unknown287 { get; set; } + public uint Unknown288 { get; set; } + public uint Unknown289 { get; set; } + public uint Unknown290 { get; set; } + public uint Unknown291 { get; set; } + public uint Unknown292 { get; set; } + public uint Unknown293 { get; set; } + public uint Unknown294 { get; set; } + public uint Unknown295 { get; set; } + public uint Unknown296 { get; set; } + public uint Unknown297 { get; set; } + public uint Unknown298 { get; set; } + public uint Unknown299 { get; set; } + public uint Unknown300 { get; set; } + public uint Unknown301 { get; set; } + public uint Unknown302 { get; set; } + public uint Unknown303 { get; set; } + public uint Unknown304 { get; set; } + public uint Unknown305 { get; set; } + public uint Unknown306 { get; set; } + public uint Unknown307 { get; set; } + public uint Unknown308 { get; set; } + public uint Unknown309 { get; set; } + public uint Unknown310 { get; set; } + public uint Unknown311 { get; set; } + public uint Unknown312 { get; set; } + public uint Unknown313 { get; set; } + public uint Unknown314 { get; set; } + public uint Unknown315 { get; set; } + public uint Unknown316 { get; set; } + public uint Unknown317 { get; set; } + public uint Unknown318 { get; set; } + public uint Unknown319 { get; set; } + public uint Unknown320 { get; set; } + public uint Unknown321 { get; set; } + public uint Unknown322 { get; set; } + public uint Unknown323 { get; set; } + public uint Unknown324 { get; set; } + public uint Unknown325 { get; set; } + public uint Unknown326 { get; set; } + public uint Unknown327 { get; set; } + public uint Unknown328 { get; set; } + public uint Unknown329 { get; set; } + public uint Unknown330 { get; set; } + public uint Unknown331 { get; set; } + public uint Unknown332 { get; set; } + public uint Unknown333 { get; set; } + public uint Unknown334 { get; set; } + public uint Unknown335 { get; set; } + public uint Unknown336 { get; set; } + public uint Unknown337 { get; set; } + public uint Unknown338 { get; set; } + public uint Unknown339 { get; set; } + public uint Unknown340 { get; set; } + public uint Unknown341 { get; set; } + public uint Unknown342 { get; set; } + public uint Unknown343 { get; set; } + public uint Unknown344 { get; set; } + public uint Unknown345 { get; set; } + public uint Unknown346 { get; set; } + public uint Unknown347 { get; set; } + public uint Unknown348 { get; set; } + public uint Unknown349 { get; set; } + public uint Unknown350 { get; set; } + public uint Unknown351 { get; set; } + public uint Unknown352 { get; set; } + public uint Unknown353 { get; set; } + public uint Unknown354 { get; set; } + public uint Unknown355 { get; set; } + public uint Unknown356 { get; set; } + public uint Unknown357 { get; set; } + public uint Unknown358 { get; set; } + public uint Unknown359 { get; set; } + public uint Unknown360 { get; set; } + public uint Unknown361 { get; set; } + public uint Unknown362 { get; set; } + public uint Unknown363 { get; set; } + public uint Unknown364 { get; set; } + public uint Unknown365 { get; set; } + public uint Unknown366 { get; set; } + public uint Unknown367 { get; set; } + public uint Unknown368 { get; set; } + public uint Unknown369 { get; set; } + public uint Unknown370 { get; set; } + public uint Unknown371 { get; set; } + public uint Unknown372 { get; set; } + public uint Unknown373 { get; set; } + public uint Unknown374 { get; set; } + public uint Unknown375 { get; set; } + public uint Unknown376 { get; set; } + public uint Unknown377 { get; set; } + public uint Unknown378 { get; set; } + public uint Unknown379 { get; set; } + public uint Unknown380 { get; set; } + public uint Unknown381 { get; set; } + public uint Unknown382 { get; set; } + public uint Unknown383 { get; set; } + public uint Unknown384 { get; set; } + public uint Unknown385 { get; set; } + public uint Unknown386 { get; set; } + public uint Unknown387 { get; set; } + public uint Unknown388 { get; set; } + public uint Unknown389 { get; set; } + public uint Unknown390 { get; set; } + public uint Unknown391 { get; set; } + public uint Unknown392 { get; set; } + public uint Unknown393 { get; set; } + public uint Unknown394 { get; set; } + public uint Unknown395 { get; set; } + public uint Unknown396 { get; set; } + public uint Unknown397 { get; set; } + public uint Unknown398 { get; set; } + public uint Unknown399 { get; set; } + public uint Unknown400 { get; set; } + public uint Unknown401 { get; set; } + public uint Unknown402 { get; set; } + public uint Unknown403 { get; set; } + public uint Unknown404 { get; set; } + public uint Unknown405 { get; set; } + public uint Unknown406 { get; set; } + public uint Unknown407 { get; set; } + public uint Unknown408 { get; set; } + public uint Unknown409 { get; set; } + public uint Unknown410 { get; set; } + public uint Unknown411 { get; set; } + public uint Unknown412 { get; set; } + public uint Unknown413 { get; set; } + public uint Unknown414 { get; set; } + public uint Unknown415 { get; set; } + public uint Unknown416 { get; set; } + public uint Unknown417 { get; set; } + public uint Unknown418 { get; set; } + public uint Unknown419 { get; set; } + public uint Unknown420 { get; set; } + public uint Unknown421 { get; set; } + public uint Unknown422 { get; set; } + public uint Unknown423 { get; set; } + public uint Unknown424 { get; set; } + public uint Unknown425 { get; set; } + public uint Unknown426 { get; set; } + public uint Unknown427 { get; set; } + public uint Unknown428 { get; set; } + public uint Unknown429 { get; set; } + public uint Unknown430 { get; set; } + public uint Unknown431 { get; set; } + public uint Unknown432 { get; set; } + public uint Unknown433 { get; set; } + public uint Unknown434 { get; set; } + public uint Unknown435 { get; set; } + public uint Unknown436 { get; set; } + public uint Unknown437 { get; set; } + public uint Unknown438 { get; set; } + public uint Unknown439 { get; set; } + public uint Unknown440 { get; set; } + public uint Unknown441 { get; set; } + public uint Unknown442 { get; set; } + public uint Unknown443 { get; set; } + public uint Unknown444 { get; set; } + public uint Unknown445 { get; set; } + public uint Unknown446 { get; set; } + public uint Unknown447 { get; set; } + public uint Unknown448 { get; set; } + public uint Unknown449 { get; set; } + public uint Unknown450 { get; set; } + public uint Unknown451 { get; set; } + public uint Unknown452 { get; set; } + public uint Unknown453 { get; set; } + public uint Unknown454 { get; set; } + public uint Unknown455 { get; set; } + public uint Unknown456 { get; set; } + public uint Unknown457 { get; set; } + public uint Unknown458 { get; set; } + public uint Unknown459 { get; set; } + public uint Unknown460 { get; set; } + public uint Unknown461 { get; set; } + public uint Unknown462 { get; set; } + public uint Unknown463 { get; set; } + public uint Unknown464 { get; set; } + public uint Unknown465 { get; set; } + public uint Unknown466 { get; set; } + public uint Unknown467 { get; set; } + public uint Unknown468 { get; set; } + public uint Unknown469 { get; set; } + public uint Unknown470 { get; set; } + public uint Unknown471 { get; set; } + public uint Unknown472 { get; set; } + public uint Unknown473 { get; set; } + public uint Unknown474 { get; set; } + public uint Unknown475 { get; set; } + public uint Unknown476 { get; set; } + public uint Unknown477 { get; set; } + public uint Unknown478 { get; set; } + public uint Unknown479 { get; set; } + public uint Unknown480 { get; set; } + public uint Unknown481 { get; set; } + public uint Unknown482 { get; set; } + public uint Unknown483 { get; set; } + public uint Unknown484 { get; set; } + public uint Unknown485 { get; set; } + public uint Unknown486 { get; set; } + public uint Unknown487 { get; set; } + public uint Unknown488 { get; set; } + public uint Unknown489 { get; set; } + public uint Unknown490 { get; set; } + public uint Unknown491 { get; set; } + public uint Unknown492 { get; set; } + public uint Unknown493 { get; set; } + public uint Unknown494 { get; set; } + public uint Unknown495 { get; set; } + public uint Unknown496 { get; set; } + public uint Unknown497 { get; set; } + public uint Unknown498 { get; set; } + public uint Unknown499 { get; set; } + public uint Unknown500 { get; set; } + public uint Unknown501 { get; set; } + public uint Unknown502 { get; set; } + public uint Unknown503 { get; set; } + public uint Unknown504 { get; set; } + public uint Unknown505 { get; set; } + public uint Unknown506 { get; set; } + public uint Unknown507 { get; set; } + public uint Unknown508 { get; set; } + public uint Unknown509 { get; set; } + public uint Unknown510 { get; set; } + public uint Unknown511 { get; set; } + public uint Unknown512 { get; set; } + public uint Unknown513 { get; set; } + public uint Unknown514 { get; set; } + public uint Unknown515 { get; set; } + public uint Unknown516 { get; set; } + public uint Unknown517 { get; set; } + public uint Unknown518 { get; set; } + public uint Unknown519 { get; set; } + public uint Unknown520 { get; set; } + public uint Unknown521 { get; set; } + public uint Unknown522 { get; set; } + public uint Unknown523 { get; set; } + public uint Unknown524 { get; set; } + public uint Unknown525 { get; set; } + public uint Unknown526 { get; set; } + public uint Unknown527 { get; set; } + public uint Unknown528 { get; set; } + public uint Unknown529 { get; set; } + public uint Unknown530 { get; set; } + public uint Unknown531 { get; set; } + public uint Unknown532 { get; set; } + public uint Unknown533 { get; set; } + public uint Unknown534 { get; set; } + public uint Unknown535 { get; set; } + public uint Unknown536 { get; set; } + public uint Unknown537 { get; set; } + public uint Unknown538 { get; set; } + public uint Unknown539 { get; set; } + public uint Unknown540 { get; set; } + public uint Unknown541 { get; set; } + public uint Unknown542 { get; set; } + public uint Unknown543 { get; set; } + public uint Unknown544 { get; set; } + public uint Unknown545 { get; set; } + public uint Unknown546 { get; set; } + public uint Unknown547 { get; set; } + public uint Unknown548 { get; set; } + public uint Unknown549 { get; set; } + public uint Unknown550 { get; set; } + public uint Unknown551 { get; set; } + public uint Unknown552 { get; set; } + public uint Unknown553 { get; set; } + public uint Unknown554 { get; set; } + public uint Unknown555 { get; set; } + public uint Unknown556 { get; set; } + public uint Unknown557 { get; set; } + public uint Unknown558 { get; set; } + public uint Unknown559 { get; set; } + public uint Unknown560 { get; set; } + public uint Unknown561 { get; set; } + public uint Unknown562 { get; set; } + public uint Unknown563 { get; set; } + public uint Unknown564 { get; set; } + public uint Unknown565 { get; set; } + public uint Unknown566 { get; set; } + public uint Unknown567 { get; set; } + public uint Unknown568 { get; set; } + public uint Unknown569 { get; set; } + public uint Unknown570 { get; set; } + public uint Unknown571 { get; set; } + public uint Unknown572 { get; set; } + public uint Unknown573 { get; set; } + public uint Unknown574 { get; set; } + public uint Unknown575 { get; set; } + public uint Unknown576 { get; set; } + public uint Unknown577 { get; set; } + public uint Unknown578 { get; set; } + public uint Unknown579 { get; set; } + public uint Unknown580 { get; set; } + public uint Unknown581 { get; set; } + public uint Unknown582 { get; set; } + public uint Unknown583 { get; set; } + public uint Unknown584 { get; set; } + public uint Unknown585 { get; set; } + public uint Unknown586 { get; set; } + public uint Unknown587 { get; set; } + public uint Unknown588 { get; set; } + public uint Unknown589 { get; set; } + public uint Unknown590 { get; set; } + public uint Unknown591 { get; set; } + public uint Unknown592 { get; set; } + public uint Unknown593 { get; set; } + public uint Unknown594 { get; set; } + public uint Unknown595 { get; set; } + public uint Unknown596 { get; set; } + public uint Unknown597 { get; set; } + public uint Unknown598 { get; set; } + public uint Unknown599 { get; set; } + public uint Unknown600 { get; set; } + public uint Unknown601 { get; set; } + public uint Unknown602 { get; set; } + public uint Unknown603 { get; set; } + public uint Unknown604 { get; set; } + public uint Unknown605 { get; set; } + public uint Unknown606 { get; set; } + public uint Unknown607 { get; set; } + public uint Unknown608 { get; set; } + public uint Unknown609 { get; set; } + public uint Unknown610 { get; set; } + public uint Unknown611 { get; set; } + public uint Unknown612 { get; set; } + public uint Unknown613 { get; set; } + public uint Unknown614 { get; set; } + public uint Unknown615 { get; set; } + public uint Unknown616 { get; set; } + public uint Unknown617 { get; set; } + public uint Unknown618 { get; set; } + public uint Unknown619 { get; set; } + public uint Unknown620 { get; set; } + public uint Unknown621 { get; set; } + public uint Unknown622 { get; set; } + public uint Unknown623 { get; set; } + public uint Unknown624 { get; set; } + public uint Unknown625 { get; set; } + public uint Unknown626 { get; set; } + public uint Unknown627 { get; set; } + public uint Unknown628 { get; set; } + public uint Unknown629 { get; set; } + public uint Unknown630 { get; set; } + public uint Unknown631 { get; set; } + public uint Unknown632 { get; set; } + public uint Unknown633 { get; set; } + public uint Unknown634 { get; set; } + public uint Unknown635 { get; set; } + public uint Unknown636 { get; set; } + public uint Unknown637 { get; set; } + public uint Unknown638 { get; set; } + public uint Unknown639 { get; set; } + public uint Unknown640 { get; set; } + public uint Unknown641 { get; set; } + public uint Unknown642 { get; set; } + public uint Unknown643 { get; set; } + public uint Unknown644 { get; set; } + public uint Unknown645 { get; set; } + public uint Unknown646 { get; set; } + public uint Unknown647 { get; set; } + public uint Unknown648 { get; set; } + public uint Unknown649 { get; set; } + public uint Unknown650 { get; set; } + public uint Unknown651 { get; set; } + public uint Unknown652 { get; set; } + public uint Unknown653 { get; set; } + public uint Unknown654 { get; set; } + public uint Unknown655 { get; set; } + public uint Unknown656 { get; set; } + public uint Unknown657 { get; set; } + public uint Unknown658 { get; set; } + public uint Unknown659 { get; set; } + public uint Unknown660 { get; set; } + public uint Unknown661 { get; set; } + public uint Unknown662 { get; set; } + public uint Unknown663 { get; set; } + public uint Unknown664 { get; set; } + public uint Unknown665 { get; set; } + public uint Unknown666 { get; set; } + public uint Unknown667 { get; set; } + public uint Unknown668 { get; set; } + public uint Unknown669 { get; set; } + public uint Unknown670 { get; set; } + public uint Unknown671 { get; set; } + public uint Unknown672 { get; set; } + public uint Unknown673 { get; set; } + public uint Unknown674 { get; set; } + public uint Unknown675 { get; set; } + public uint Unknown676 { get; set; } + public uint Unknown677 { get; set; } + public uint Unknown678 { get; set; } + public uint Unknown679 { get; set; } + public uint Unknown680 { get; set; } + public uint Unknown681 { get; set; } + public uint Unknown682 { get; set; } + public uint Unknown683 { get; set; } + public uint Unknown684 { get; set; } + public uint Unknown685 { get; set; } + public uint Unknown686 { get; set; } + public uint Unknown687 { get; set; } + public uint Unknown688 { get; set; } + public uint Unknown689 { get; set; } + public uint Unknown690 { get; set; } + public uint Unknown691 { get; set; } + public uint Unknown692 { get; set; } + public uint Unknown693 { get; set; } + public uint Unknown694 { get; set; } + public uint Unknown695 { get; set; } + public uint Unknown696 { get; set; } + public uint Unknown697 { get; set; } + public uint Unknown698 { get; set; } + public uint Unknown699 { get; set; } + public uint Unknown700 { get; set; } + public uint Unknown701 { get; set; } + public uint Unknown702 { get; set; } + public uint Unknown703 { get; set; } + public uint Unknown704 { get; set; } + public uint Unknown705 { get; set; } + public uint Unknown706 { get; set; } + public uint Unknown707 { get; set; } + public uint Unknown708 { get; set; } + public uint Unknown709 { get; set; } + public uint Unknown710 { get; set; } + public uint Unknown711 { get; set; } + public uint Unknown712 { get; set; } + public uint Unknown713 { get; set; } + public uint Unknown714 { get; set; } + public uint Unknown715 { get; set; } + public uint Unknown716 { get; set; } + public uint Unknown717 { get; set; } + public uint Unknown718 { get; set; } + public uint Unknown719 { get; set; } + public uint Unknown720 { get; set; } + public uint Unknown721 { get; set; } + public uint Unknown722 { get; set; } + public uint Unknown723 { get; set; } + public uint Unknown724 { get; set; } + public uint Unknown725 { get; set; } + public uint Unknown726 { get; set; } + public uint Unknown727 { get; set; } + public uint Unknown728 { get; set; } + public uint Unknown729 { get; set; } + public uint Unknown730 { get; set; } + public uint Unknown731 { get; set; } + public uint Unknown732 { get; set; } + public uint Unknown733 { get; set; } + public uint Unknown734 { get; set; } + public uint Unknown735 { get; set; } + public uint Unknown736 { get; set; } + public uint Unknown737 { get; set; } + public uint Unknown738 { get; set; } + public uint Unknown739 { get; set; } + public uint Unknown740 { get; set; } + public uint Unknown741 { get; set; } + public uint Unknown742 { get; set; } + public uint Unknown743 { get; set; } + public uint Unknown744 { get; set; } + public uint Unknown745 { get; set; } + public uint Unknown746 { get; set; } + public uint Unknown747 { get; set; } + public uint Unknown748 { get; set; } + public uint Unknown749 { get; set; } + public uint Unknown750 { get; set; } + public uint Unknown751 { get; set; } + public uint Unknown752 { get; set; } + public uint Unknown753 { get; set; } + public uint Unknown754 { get; set; } + public uint Unknown755 { get; set; } + public uint Unknown756 { get; set; } + public uint Unknown757 { get; set; } + public uint Unknown758 { get; set; } + public uint Unknown759 { get; set; } + public uint Unknown760 { get; set; } + public uint Unknown761 { get; set; } + public uint Unknown762 { get; set; } + public uint Unknown763 { get; set; } + public uint Unknown764 { get; set; } + public uint Unknown765 { get; set; } + public uint Unknown766 { get; set; } + public uint Unknown767 { get; set; } + public uint Unknown768 { get; set; } + public uint Unknown769 { get; set; } + public uint Unknown770 { get; set; } + public uint Unknown771 { get; set; } + public uint Unknown772 { get; set; } + public uint Unknown773 { get; set; } + public uint Unknown774 { get; set; } + public uint Unknown775 { get; set; } + public uint Unknown776 { get; set; } + public uint Unknown777 { get; set; } + public uint Unknown778 { get; set; } + public uint Unknown779 { get; set; } + public uint Unknown780 { get; set; } + public uint Unknown781 { get; set; } + public uint Unknown782 { get; set; } + public uint Unknown783 { get; set; } + public uint Unknown784 { get; set; } + public uint Unknown785 { get; set; } + public uint Unknown786 { get; set; } + public uint Unknown787 { get; set; } + public uint Unknown788 { get; set; } + public uint Unknown789 { get; set; } + public uint Unknown790 { get; set; } + public uint Unknown791 { get; set; } + public uint Unknown792 { get; set; } + public uint Unknown793 { get; set; } + public uint Unknown794 { get; set; } + public uint Unknown795 { get; set; } + public uint Unknown796 { get; set; } + public uint Unknown797 { get; set; } + public uint Unknown798 { get; set; } + public uint Unknown799 { get; set; } + public uint Unknown800 { get; set; } + public uint Unknown801 { get; set; } + public uint Unknown802 { get; set; } + public uint Unknown803 { get; set; } + public uint Unknown804 { get; set; } + public uint Unknown805 { get; set; } + public uint Unknown806 { get; set; } + public uint Unknown807 { get; set; } + public uint Unknown808 { get; set; } + public uint Unknown809 { get; set; } + public uint Unknown810 { get; set; } + public uint Unknown811 { get; set; } + public uint Unknown812 { get; set; } + public uint Unknown813 { get; set; } + public uint Unknown814 { get; set; } + public uint Unknown815 { get; set; } + public uint Unknown816 { get; set; } + public uint Unknown817 { get; set; } + public uint Unknown818 { get; set; } + public uint Unknown819 { get; set; } + public uint Unknown820 { get; set; } + public uint Unknown821 { get; set; } + public uint Unknown822 { get; set; } + public uint Unknown823 { get; set; } + public uint Unknown824 { get; set; } + public uint Unknown825 { get; set; } + public uint Unknown826 { get; set; } + public uint Unknown827 { get; set; } + public uint Unknown828 { get; set; } + public uint Unknown829 { get; set; } + public uint Unknown830 { get; set; } + public uint Unknown831 { get; set; } + public uint Unknown832 { get; set; } + public uint Unknown833 { get; set; } + public uint Unknown834 { get; set; } + public uint Unknown835 { get; set; } + public uint Unknown836 { get; set; } + public uint Unknown837 { get; set; } + public uint Unknown838 { get; set; } + public uint Unknown839 { get; set; } + public uint Unknown840 { get; set; } + public uint Unknown841 { get; set; } + public uint Unknown842 { get; set; } + public uint Unknown843 { get; set; } + public uint Unknown844 { get; set; } + public uint Unknown845 { get; set; } + public uint Unknown846 { get; set; } + public uint Unknown847 { get; set; } + public uint Unknown848 { get; set; } + public uint Unknown849 { get; set; } + public uint Unknown850 { get; set; } + public uint Unknown851 { get; set; } + public uint Unknown852 { get; set; } + public uint Unknown853 { get; set; } + public uint Unknown854 { get; set; } + public uint Unknown855 { get; set; } + public uint Unknown856 { get; set; } + public uint Unknown857 { get; set; } + public uint Unknown858 { get; set; } + public uint Unknown859 { get; set; } + public uint Unknown860 { get; set; } + public uint Unknown861 { get; set; } + public uint Unknown862 { get; set; } + public uint Unknown863 { get; set; } + public uint Unknown864 { get; set; } + public uint Unknown865 { get; set; } + public uint Unknown866 { get; set; } + public uint Unknown867 { get; set; } + public uint Unknown868 { get; set; } + public uint Unknown869 { get; set; } + public uint Unknown870 { get; set; } + public uint Unknown871 { get; set; } + public uint Unknown872 { get; set; } + public uint Unknown873 { get; set; } + public uint Unknown874 { get; set; } + public uint Unknown875 { get; set; } + public uint Unknown876 { get; set; } + public uint Unknown877 { get; set; } + public uint Unknown878 { get; set; } + public uint Unknown879 { get; set; } + public uint Unknown880 { get; set; } + public uint Unknown881 { get; set; } + public uint Unknown882 { get; set; } + public uint Unknown883 { get; set; } + public uint Unknown884 { get; set; } + public uint Unknown885 { get; set; } + public uint Unknown886 { get; set; } + public uint Unknown887 { get; set; } + public uint Unknown888 { get; set; } + public uint Unknown889 { get; set; } + public uint Unknown890 { get; set; } + public uint Unknown891 { get; set; } + public uint Unknown892 { get; set; } + public uint Unknown893 { get; set; } + public uint Unknown894 { get; set; } + public uint Unknown895 { get; set; } + public uint Unknown896 { get; set; } + public uint Unknown897 { get; set; } + public uint Unknown898 { get; set; } + public uint Unknown899 { get; set; } + public uint Unknown900 { get; set; } + public uint Unknown901 { get; set; } + public uint Unknown902 { get; set; } + public uint Unknown903 { get; set; } + public uint Unknown904 { get; set; } + public uint Unknown905 { get; set; } + public uint Unknown906 { get; set; } + public uint Unknown907 { get; set; } + public uint Unknown908 { get; set; } + public uint Unknown909 { get; set; } + public uint Unknown910 { get; set; } + public uint Unknown911 { get; set; } + public uint Unknown912 { get; set; } + public uint Unknown913 { get; set; } + public uint Unknown914 { get; set; } + public uint Unknown915 { get; set; } + public uint Unknown916 { get; set; } + public uint Unknown917 { get; set; } + public uint Unknown918 { get; set; } + public uint Unknown919 { get; set; } + public uint Unknown920 { get; set; } + public uint Unknown921 { get; set; } + public uint Unknown922 { get; set; } + public uint Unknown923 { get; set; } + public uint Unknown924 { get; set; } + public uint Unknown925 { get; set; } + public uint Unknown926 { get; set; } + public uint Unknown927 { get; set; } + public uint Unknown928 { get; set; } + public uint Unknown929 { get; set; } + public uint Unknown930 { get; set; } + public uint Unknown931 { get; set; } + public uint Unknown932 { get; set; } + public uint Unknown933 { get; set; } + public uint Unknown934 { get; set; } + public uint Unknown935 { get; set; } + public uint Unknown936 { get; set; } + public uint Unknown937 { get; set; } + public uint Unknown938 { get; set; } + public uint Unknown939 { get; set; } + public uint Unknown940 { get; set; } + public uint Unknown941 { get; set; } + public uint Unknown942 { get; set; } + public uint Unknown943 { get; set; } + public uint Unknown944 { get; set; } + public uint Unknown945 { get; set; } + public uint Unknown946 { get; set; } + public uint Unknown947 { get; set; } + public uint Unknown948 { get; set; } + public uint Unknown949 { get; set; } + public uint Unknown950 { get; set; } + public uint Unknown951 { get; set; } + public uint Unknown952 { get; set; } + public uint Unknown953 { get; set; } + public uint Unknown954 { get; set; } + public uint Unknown955 { get; set; } + public uint Unknown956 { get; set; } + public uint Unknown957 { get; set; } + public uint Unknown958 { get; set; } + public uint Unknown959 { get; set; } + public uint Unknown960 { get; set; } + public uint Unknown961 { get; set; } + public uint Unknown962 { get; set; } + public uint Unknown963 { get; set; } + public uint Unknown964 { get; set; } + public uint Unknown965 { get; set; } + public byte Unknown966 { get; set; } + public byte Unknown967 { get; set; } + public byte Unknown968 { get; set; } + public byte Unknown969 { get; set; } + public byte Unknown970 { get; set; } + public byte Unknown971 { get; set; } + public byte Unknown972 { get; set; } + public byte Unknown973 { get; set; } + public byte Unknown974 { get; set; } + public byte Unknown975 { get; set; } + public byte Unknown976 { get; set; } + public byte Unknown977 { get; set; } + public byte Unknown978 { get; set; } + public byte Unknown979 { get; set; } + public byte Unknown980 { get; set; } + public byte Unknown981 { get; set; } + public byte Unknown982 { get; set; } + public byte Unknown983 { get; set; } + public byte Unknown984 { get; set; } + public byte Unknown985 { get; set; } + public byte Unknown986 { get; set; } + public byte Unknown987 { get; set; } + public byte Unknown988 { get; set; } + public byte Unknown989 { get; set; } + public byte Unknown990 { get; set; } + public byte Unknown991 { get; set; } + public byte Unknown992 { get; set; } + public byte Unknown993 { get; set; } + public byte Unknown994 { get; set; } + public byte Unknown995 { get; set; } + public byte Unknown996 { get; set; } + public byte Unknown997 { get; set; } + public byte Unknown998 { get; set; } + public byte Unknown999 { get; set; } + public byte Unknown1000 { get; set; } + public byte Unknown1001 { get; set; } + public byte Unknown1002 { get; set; } + public byte Unknown1003 { get; set; } + public byte Unknown1004 { get; set; } + public byte Unknown1005 { get; set; } + public byte Unknown1006 { get; set; } + public byte Unknown1007 { get; set; } + public byte Unknown1008 { get; set; } + public byte Unknown1009 { get; set; } + public byte Unknown1010 { get; set; } + public byte Unknown1011 { get; set; } + public byte Unknown1012 { get; set; } + public byte Unknown1013 { get; set; } + public byte Unknown1014 { get; set; } + public byte Unknown1015 { get; set; } + public byte Unknown1016 { get; set; } + public byte Unknown1017 { get; set; } + public byte Unknown1018 { get; set; } + public byte Unknown1019 { get; set; } + public byte Unknown1020 { get; set; } + public byte Unknown1021 { get; set; } + public byte Unknown1022 { get; set; } + public byte Unknown1023 { get; set; } + public byte Unknown1024 { get; set; } + public byte Unknown1025 { get; set; } + public byte Unknown1026 { get; set; } + public byte Unknown1027 { get; set; } + public byte Unknown1028 { get; set; } + public byte Unknown1029 { get; set; } + public byte Unknown1030 { get; set; } + public byte Unknown1031 { get; set; } + public byte Unknown1032 { get; set; } + public byte Unknown1033 { get; set; } + public byte Unknown1034 { get; set; } + public byte Unknown1035 { get; set; } + public byte Unknown1036 { get; set; } + public byte Unknown1037 { get; set; } + public byte Unknown1038 { get; set; } + public byte Unknown1039 { get; set; } + public byte Unknown1040 { get; set; } + public byte Unknown1041 { get; set; } + public byte Unknown1042 { get; set; } + public byte Unknown1043 { get; set; } + public byte Unknown1044 { get; set; } + public byte Unknown1045 { get; set; } + public byte Unknown1046 { get; set; } + public byte Unknown1047 { get; set; } + public byte Unknown1048 { get; set; } + public byte Unknown1049 { get; set; } + public byte Unknown1050 { get; set; } + public byte Unknown1051 { get; set; } + public byte Unknown1052 { get; set; } + public byte Unknown1053 { get; set; } + public byte Unknown1054 { get; set; } + public byte Unknown1055 { get; set; } + public int Unknown1056 { get; set; } + public int Unknown1057 { get; set; } + public int Unknown1058 { get; set; } + public int Unknown1059 { get; set; } + public int Unknown1060 { get; set; } + public int Unknown1061 { get; set; } + public int Unknown1062 { get; set; } + public int Unknown1063 { get; set; } + public int Unknown1064 { get; set; } + public int Unknown1065 { get; set; } + public int Unknown1066 { get; set; } + public int Unknown1067 { get; set; } + public int Unknown1068 { get; set; } + public int Unknown1069 { get; set; } + public int Unknown1070 { get; set; } + public int Unknown1071 { get; set; } + public int Unknown1072 { get; set; } + public int Unknown1073 { get; set; } + public int Unknown1074 { get; set; } + public int Unknown1075 { get; set; } + public int Unknown1076 { get; set; } + public int Unknown1077 { get; set; } + public int Unknown1078 { get; set; } + public int Unknown1079 { get; set; } + public int Unknown1080 { get; set; } + public int Unknown1081 { get; set; } + public int Unknown1082 { get; set; } + public int Unknown1083 { get; set; } + public int Unknown1084 { get; set; } + public int Unknown1085 { get; set; } + public int Unknown1086 { get; set; } + public int Unknown1087 { get; set; } + public int Unknown1088 { get; set; } + public int Unknown1089 { get; set; } + public int Unknown1090 { get; set; } + public int Unknown1091 { get; set; } + public int Unknown1092 { get; set; } + public int Unknown1093 { get; set; } + public int Unknown1094 { get; set; } + public int Unknown1095 { get; set; } + public int Unknown1096 { get; set; } + public int Unknown1097 { get; set; } + public int Unknown1098 { get; set; } + public int Unknown1099 { get; set; } + public int Unknown1100 { get; set; } + public int Unknown1101 { get; set; } + public int Unknown1102 { get; set; } + public int Unknown1103 { get; set; } + public int Unknown1104 { get; set; } + public int Unknown1105 { get; set; } + public int Unknown1106 { get; set; } + public int Unknown1107 { get; set; } + public int Unknown1108 { get; set; } + public int Unknown1109 { get; set; } + public int Unknown1110 { get; set; } + public int Unknown1111 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Race = new LazyRow< Race >( lumina, parser.ReadColumn< int >( 0 ), language ); - Tribe = new LazyRow< Tribe >( lumina, parser.ReadColumn< int >( 1 ), language ); + Race = new LazyRow< Race >( gameData, parser.ReadColumn< int >( 0 ), language ); + Tribe = new LazyRow< Tribe >( gameData, parser.ReadColumn< int >( 1 ), language ); Gender = parser.ReadColumn< sbyte >( 2 ); Unknown3 = parser.ReadColumn< uint >( 3 ); Unknown4 = parser.ReadColumn< uint >( 4 ); diff --git a/src/Lumina.Excel/GeneratedSheets/HouseRetainerPose.cs b/src/Lumina.Excel/GeneratedSheets/HouseRetainerPose.cs index 0acc6f6b..329447d3 100644 --- a/src/Lumina.Excel/GeneratedSheets/HouseRetainerPose.cs +++ b/src/Lumina.Excel/GeneratedSheets/HouseRetainerPose.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "HouseRetainerPose", columnHash: 0xd870e208 )] - public class HouseRetainerPose : IExcelRow + public class HouseRetainerPose : ExcelRow { - public LazyRow< ActionTimeline > ActionTimeline; + public LazyRow< ActionTimeline > ActionTimeline { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - ActionTimeline = new LazyRow< ActionTimeline >( lumina, parser.ReadColumn< ushort >( 0 ), language ); + ActionTimeline = new LazyRow< ActionTimeline >( gameData, parser.ReadColumn< ushort >( 0 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/HousingAethernet.cs b/src/Lumina.Excel/GeneratedSheets/HousingAethernet.cs index eb7004a6..cb867973 100644 --- a/src/Lumina.Excel/GeneratedSheets/HousingAethernet.cs +++ b/src/Lumina.Excel/GeneratedSheets/HousingAethernet.cs @@ -7,25 +7,21 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "HousingAethernet", columnHash: 0x751baa92 )] - public class HousingAethernet : IExcelRow + public class HousingAethernet : ExcelRow { - public LazyRow< Level > Level; - public LazyRow< TerritoryType > TerritoryType; - public LazyRow< PlaceName > PlaceName; - public byte Order; + public LazyRow< Level > Level { get; set; } + public LazyRow< TerritoryType > TerritoryType { get; set; } + public LazyRow< PlaceName > PlaceName { get; set; } + public byte Order { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Level = new LazyRow< Level >( lumina, parser.ReadColumn< uint >( 0 ), language ); - TerritoryType = new LazyRow< TerritoryType >( lumina, parser.ReadColumn< ushort >( 1 ), language ); - PlaceName = new LazyRow< PlaceName >( lumina, parser.ReadColumn< ushort >( 2 ), language ); + Level = new LazyRow< Level >( gameData, parser.ReadColumn< uint >( 0 ), language ); + TerritoryType = new LazyRow< TerritoryType >( gameData, parser.ReadColumn< ushort >( 1 ), language ); + PlaceName = new LazyRow< PlaceName >( gameData, parser.ReadColumn< ushort >( 2 ), language ); Order = parser.ReadColumn< byte >( 3 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/HousingAppeal.cs b/src/Lumina.Excel/GeneratedSheets/HousingAppeal.cs index 552ea3c6..85d17a48 100644 --- a/src/Lumina.Excel/GeneratedSheets/HousingAppeal.cs +++ b/src/Lumina.Excel/GeneratedSheets/HousingAppeal.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "HousingAppeal", columnHash: 0xb89097b5 )] - public class HousingAppeal : IExcelRow + public class HousingAppeal : ExcelRow { - public SeString Tag; - public uint Icon; - public byte Order; + public SeString Tag { get; set; } + public uint Icon { get; set; } + public byte Order { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Tag = parser.ReadColumn< SeString >( 0 ); Icon = parser.ReadColumn< uint >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/HousingEmploymentNpcList.cs b/src/Lumina.Excel/GeneratedSheets/HousingEmploymentNpcList.cs index 386b028a..27083957 100644 --- a/src/Lumina.Excel/GeneratedSheets/HousingEmploymentNpcList.cs +++ b/src/Lumina.Excel/GeneratedSheets/HousingEmploymentNpcList.cs @@ -7,24 +7,20 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "HousingEmploymentNpcList", columnHash: 0x6195119b )] - public class HousingEmploymentNpcList : IExcelRow + public class HousingEmploymentNpcList : ExcelRow { - public LazyRow< HousingEmploymentNpcRace > Race; - public LazyRow< ENpcBase >[] ENpcBase; + public LazyRow< HousingEmploymentNpcRace > Race { get; set; } + public LazyRow< ENpcBase >[] ENpcBase { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Race = new LazyRow< HousingEmploymentNpcRace >( lumina, parser.ReadColumn< byte >( 0 ), language ); + Race = new LazyRow< HousingEmploymentNpcRace >( gameData, parser.ReadColumn< byte >( 0 ), language ); ENpcBase = new LazyRow< ENpcBase >[ 2 ]; for( var i = 0; i < 2; i++ ) - ENpcBase[ i ] = new LazyRow< ENpcBase >( lumina, parser.ReadColumn< uint >( 1 + i ), language ); + ENpcBase[ i ] = new LazyRow< ENpcBase >( gameData, parser.ReadColumn< uint >( 1 + i ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/HousingEmploymentNpcRace.cs b/src/Lumina.Excel/GeneratedSheets/HousingEmploymentNpcRace.cs index e6101d12..e7fbb533 100644 --- a/src/Lumina.Excel/GeneratedSheets/HousingEmploymentNpcRace.cs +++ b/src/Lumina.Excel/GeneratedSheets/HousingEmploymentNpcRace.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "HousingEmploymentNpcRace", columnHash: 0xdebb20e3 )] - public class HousingEmploymentNpcRace : IExcelRow + public class HousingEmploymentNpcRace : ExcelRow { - public SeString Race; + public SeString Race { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Race = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/HousingExterior.cs b/src/Lumina.Excel/GeneratedSheets/HousingExterior.cs index 71345acd..e080d7ce 100644 --- a/src/Lumina.Excel/GeneratedSheets/HousingExterior.cs +++ b/src/Lumina.Excel/GeneratedSheets/HousingExterior.cs @@ -7,26 +7,22 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "HousingExterior", columnHash: 0xb56595e0 )] - public class HousingExterior : IExcelRow + public class HousingExterior : ExcelRow { - public byte Unknown0; - public byte Unknown1; - public LazyRow< PlaceName > PlaceName; - public byte HousingSize; - public SeString Model; + public byte Unknown0 { get; set; } + public byte Unknown1 { get; set; } + public LazyRow< PlaceName > PlaceName { get; set; } + public byte HousingSize { get; set; } + public SeString Model { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< byte >( 0 ); Unknown1 = parser.ReadColumn< byte >( 1 ); - PlaceName = new LazyRow< PlaceName >( lumina, parser.ReadColumn< ushort >( 2 ), language ); + PlaceName = new LazyRow< PlaceName >( gameData, parser.ReadColumn< ushort >( 2 ), language ); HousingSize = parser.ReadColumn< byte >( 3 ); Model = parser.ReadColumn< SeString >( 4 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/HousingFurniture.cs b/src/Lumina.Excel/GeneratedSheets/HousingFurniture.cs index 25b48e03..d0cee60c 100644 --- a/src/Lumina.Excel/GeneratedSheets/HousingFurniture.cs +++ b/src/Lumina.Excel/GeneratedSheets/HousingFurniture.cs @@ -7,32 +7,28 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "HousingFurniture", columnHash: 0xccfbe5ff )] - public class HousingFurniture : IExcelRow + public class HousingFurniture : ExcelRow { - public ushort ModelKey; - public byte HousingItemCategory; - public byte UsageType; - public uint UsageParameter; - public byte Unknown4; - public byte AquariumTier; - public LazyRow< CustomTalk > CustomTalk; - public LazyRow< Item > Item; - public bool DestroyOnRemoval; - public LazyRow< HousingPlacement > Tooltip; - public byte Unknown10; - public byte Unknown11; - public byte Unknown12; - public bool Unknown13; - public bool Unknown14; + public ushort ModelKey { get; set; } + public byte HousingItemCategory { get; set; } + public byte UsageType { get; set; } + public uint UsageParameter { get; set; } + public byte Unknown4 { get; set; } + public byte AquariumTier { get; set; } + public LazyRow< CustomTalk > CustomTalk { get; set; } + public LazyRow< Item > Item { get; set; } + public bool DestroyOnRemoval { get; set; } + public LazyRow< HousingPlacement > Tooltip { get; set; } + public byte Unknown10 { get; set; } + public byte Unknown11 { get; set; } + public byte Unknown12 { get; set; } + public bool Unknown13 { get; set; } + public bool Unknown14 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); ModelKey = parser.ReadColumn< ushort >( 0 ); HousingItemCategory = parser.ReadColumn< byte >( 1 ); @@ -40,8 +36,8 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) UsageParameter = parser.ReadColumn< uint >( 3 ); Unknown4 = parser.ReadColumn< byte >( 4 ); AquariumTier = parser.ReadColumn< byte >( 5 ); - CustomTalk = new LazyRow< CustomTalk >( lumina, parser.ReadColumn< uint >( 6 ), language ); - Item = new LazyRow< Item >( lumina, parser.ReadColumn< uint >( 7 ), language ); + CustomTalk = new LazyRow< CustomTalk >( gameData, parser.ReadColumn< uint >( 6 ), language ); + Item = new LazyRow< Item >( gameData, parser.ReadColumn< uint >( 7 ), language ); DestroyOnRemoval = parser.ReadColumn< bool >( 8 ); #warning generator error: the definition for this field (Tooltip) has an invalid type for a LazyRow Unknown10 = parser.ReadColumn< byte >( 10 ); diff --git a/src/Lumina.Excel/GeneratedSheets/HousingLandSet.cs b/src/Lumina.Excel/GeneratedSheets/HousingLandSet.cs index 3228f294..1e0843c6 100644 --- a/src/Lumina.Excel/GeneratedSheets/HousingLandSet.cs +++ b/src/Lumina.Excel/GeneratedSheets/HousingLandSet.cs @@ -7,142 +7,138 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "HousingLandSet", columnHash: 0xc557f79e )] - public class HousingLandSet : IExcelRow + public class HousingLandSet : ExcelRow { - public byte[] PlotSize; - public uint[] MinPrice; - public uint Unknown120; - public uint Unknown121; - public uint Unknown122; - public uint Unknown123; - public uint Unknown124; - public uint Unknown125; - public uint Unknown126; - public uint Unknown127; - public uint Unknown128; - public uint Unknown129; - public uint Unknown130; - public uint Unknown131; - public uint Unknown132; - public uint Unknown133; - public uint Unknown134; - public uint Unknown135; - public uint Unknown136; - public uint Unknown137; - public uint Unknown138; - public uint Unknown139; - public uint Unknown140; - public uint Unknown141; - public uint Unknown142; - public uint Unknown143; - public uint Unknown144; - public uint Unknown145; - public uint Unknown146; - public uint Unknown147; - public uint Unknown148; - public uint Unknown149; - public uint Unknown150; - public uint Unknown151; - public uint Unknown152; - public uint Unknown153; - public uint Unknown154; - public uint Unknown155; - public uint Unknown156; - public uint Unknown157; - public uint Unknown158; - public uint Unknown159; - public uint Unknown160; - public uint Unknown161; - public uint Unknown162; - public uint Unknown163; - public uint Unknown164; - public uint Unknown165; - public uint Unknown166; - public uint Unknown167; - public uint Unknown168; - public uint Unknown169; - public uint Unknown170; - public uint Unknown171; - public uint Unknown172; - public uint Unknown173; - public uint Unknown174; - public uint Unknown175; - public uint Unknown176; - public uint Unknown177; - public uint Unknown178; - public uint Unknown179; - public uint Unknown180; - public uint Unknown181; - public uint Unknown182; - public uint Unknown183; - public uint Unknown184; - public uint Unknown185; - public uint Unknown186; - public uint Unknown187; - public uint Unknown188; - public uint Unknown189; - public uint Unknown190; - public uint Unknown191; - public uint Unknown192; - public uint Unknown193; - public uint Unknown194; - public uint Unknown195; - public uint Unknown196; - public uint Unknown197; - public uint Unknown198; - public uint Unknown199; - public uint Unknown200; - public uint Unknown201; - public uint Unknown202; - public uint Unknown203; - public uint Unknown204; - public uint Unknown205; - public uint Unknown206; - public uint Unknown207; - public uint Unknown208; - public uint Unknown209; - public uint Unknown210; - public uint Unknown211; - public uint Unknown212; - public uint Unknown213; - public uint Unknown214; - public uint Unknown215; - public uint Unknown216; - public uint Unknown217; - public uint Unknown218; - public uint Unknown219; - public uint Unknown220; - public uint Unknown221; - public uint Unknown222; - public uint Unknown223; - public uint Unknown224; - public uint Unknown225; - public uint Unknown226; - public uint Unknown227; - public uint Unknown228; - public uint Unknown229; - public uint Unknown230; - public uint Unknown231; - public uint Unknown232; - public uint Unknown233; - public uint Unknown234; - public uint Unknown235; - public uint Unknown236; - public uint Unknown237; - public uint Unknown238; - public uint Unknown239; - public uint[] InitialPrice; - public uint Unknown300; - public uint Unknown301; + public byte[] PlotSize { get; set; } + public uint[] MinPrice { get; set; } + public uint Unknown120 { get; set; } + public uint Unknown121 { get; set; } + public uint Unknown122 { get; set; } + public uint Unknown123 { get; set; } + public uint Unknown124 { get; set; } + public uint Unknown125 { get; set; } + public uint Unknown126 { get; set; } + public uint Unknown127 { get; set; } + public uint Unknown128 { get; set; } + public uint Unknown129 { get; set; } + public uint Unknown130 { get; set; } + public uint Unknown131 { get; set; } + public uint Unknown132 { get; set; } + public uint Unknown133 { get; set; } + public uint Unknown134 { get; set; } + public uint Unknown135 { get; set; } + public uint Unknown136 { get; set; } + public uint Unknown137 { get; set; } + public uint Unknown138 { get; set; } + public uint Unknown139 { get; set; } + public uint Unknown140 { get; set; } + public uint Unknown141 { get; set; } + public uint Unknown142 { get; set; } + public uint Unknown143 { get; set; } + public uint Unknown144 { get; set; } + public uint Unknown145 { get; set; } + public uint Unknown146 { get; set; } + public uint Unknown147 { get; set; } + public uint Unknown148 { get; set; } + public uint Unknown149 { get; set; } + public uint Unknown150 { get; set; } + public uint Unknown151 { get; set; } + public uint Unknown152 { get; set; } + public uint Unknown153 { get; set; } + public uint Unknown154 { get; set; } + public uint Unknown155 { get; set; } + public uint Unknown156 { get; set; } + public uint Unknown157 { get; set; } + public uint Unknown158 { get; set; } + public uint Unknown159 { get; set; } + public uint Unknown160 { get; set; } + public uint Unknown161 { get; set; } + public uint Unknown162 { get; set; } + public uint Unknown163 { get; set; } + public uint Unknown164 { get; set; } + public uint Unknown165 { get; set; } + public uint Unknown166 { get; set; } + public uint Unknown167 { get; set; } + public uint Unknown168 { get; set; } + public uint Unknown169 { get; set; } + public uint Unknown170 { get; set; } + public uint Unknown171 { get; set; } + public uint Unknown172 { get; set; } + public uint Unknown173 { get; set; } + public uint Unknown174 { get; set; } + public uint Unknown175 { get; set; } + public uint Unknown176 { get; set; } + public uint Unknown177 { get; set; } + public uint Unknown178 { get; set; } + public uint Unknown179 { get; set; } + public uint Unknown180 { get; set; } + public uint Unknown181 { get; set; } + public uint Unknown182 { get; set; } + public uint Unknown183 { get; set; } + public uint Unknown184 { get; set; } + public uint Unknown185 { get; set; } + public uint Unknown186 { get; set; } + public uint Unknown187 { get; set; } + public uint Unknown188 { get; set; } + public uint Unknown189 { get; set; } + public uint Unknown190 { get; set; } + public uint Unknown191 { get; set; } + public uint Unknown192 { get; set; } + public uint Unknown193 { get; set; } + public uint Unknown194 { get; set; } + public uint Unknown195 { get; set; } + public uint Unknown196 { get; set; } + public uint Unknown197 { get; set; } + public uint Unknown198 { get; set; } + public uint Unknown199 { get; set; } + public uint Unknown200 { get; set; } + public uint Unknown201 { get; set; } + public uint Unknown202 { get; set; } + public uint Unknown203 { get; set; } + public uint Unknown204 { get; set; } + public uint Unknown205 { get; set; } + public uint Unknown206 { get; set; } + public uint Unknown207 { get; set; } + public uint Unknown208 { get; set; } + public uint Unknown209 { get; set; } + public uint Unknown210 { get; set; } + public uint Unknown211 { get; set; } + public uint Unknown212 { get; set; } + public uint Unknown213 { get; set; } + public uint Unknown214 { get; set; } + public uint Unknown215 { get; set; } + public uint Unknown216 { get; set; } + public uint Unknown217 { get; set; } + public uint Unknown218 { get; set; } + public uint Unknown219 { get; set; } + public uint Unknown220 { get; set; } + public uint Unknown221 { get; set; } + public uint Unknown222 { get; set; } + public uint Unknown223 { get; set; } + public uint Unknown224 { get; set; } + public uint Unknown225 { get; set; } + public uint Unknown226 { get; set; } + public uint Unknown227 { get; set; } + public uint Unknown228 { get; set; } + public uint Unknown229 { get; set; } + public uint Unknown230 { get; set; } + public uint Unknown231 { get; set; } + public uint Unknown232 { get; set; } + public uint Unknown233 { get; set; } + public uint Unknown234 { get; set; } + public uint Unknown235 { get; set; } + public uint Unknown236 { get; set; } + public uint Unknown237 { get; set; } + public uint Unknown238 { get; set; } + public uint Unknown239 { get; set; } + public uint[] InitialPrice { get; set; } + public uint Unknown300 { get; set; } + public uint Unknown301 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); PlotSize = new byte[ 60 ]; for( var i = 0; i < 60; i++ ) diff --git a/src/Lumina.Excel/GeneratedSheets/HousingMapMarkerInfo.cs b/src/Lumina.Excel/GeneratedSheets/HousingMapMarkerInfo.cs index b6fd764d..b2002f8d 100644 --- a/src/Lumina.Excel/GeneratedSheets/HousingMapMarkerInfo.cs +++ b/src/Lumina.Excel/GeneratedSheets/HousingMapMarkerInfo.cs @@ -7,28 +7,24 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "HousingMapMarkerInfo", columnHash: 0x13236296 )] - public class HousingMapMarkerInfo : IExcelRow + public class HousingMapMarkerInfo : ExcelRow { - public float X; - public float Y; - public float Z; - public float Unknown3; - public LazyRow< Map > Map; + public float X { get; set; } + public float Y { get; set; } + public float Z { get; set; } + public float Unknown3 { get; set; } + public LazyRow< Map > Map { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); X = parser.ReadColumn< float >( 0 ); Y = parser.ReadColumn< float >( 1 ); Z = parser.ReadColumn< float >( 2 ); Unknown3 = parser.ReadColumn< float >( 3 ); - Map = new LazyRow< Map >( lumina, parser.ReadColumn< ushort >( 4 ), language ); + Map = new LazyRow< Map >( gameData, parser.ReadColumn< ushort >( 4 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/HousingMerchantPose.cs b/src/Lumina.Excel/GeneratedSheets/HousingMerchantPose.cs index 6f168294..97b6f0fe 100644 --- a/src/Lumina.Excel/GeneratedSheets/HousingMerchantPose.cs +++ b/src/Lumina.Excel/GeneratedSheets/HousingMerchantPose.cs @@ -7,21 +7,17 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "HousingMerchantPose", columnHash: 0x3d65a9f1 )] - public class HousingMerchantPose : IExcelRow + public class HousingMerchantPose : ExcelRow { - public LazyRow< ActionTimeline > ActionTimeline; - public SeString Pose; + public LazyRow< ActionTimeline > ActionTimeline { get; set; } + public SeString Pose { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - ActionTimeline = new LazyRow< ActionTimeline >( lumina, parser.ReadColumn< ushort >( 0 ), language ); + ActionTimeline = new LazyRow< ActionTimeline >( gameData, parser.ReadColumn< ushort >( 0 ), language ); Pose = parser.ReadColumn< SeString >( 1 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/HousingPlacement.cs b/src/Lumina.Excel/GeneratedSheets/HousingPlacement.cs index 04cbfbcc..af973528 100644 --- a/src/Lumina.Excel/GeneratedSheets/HousingPlacement.cs +++ b/src/Lumina.Excel/GeneratedSheets/HousingPlacement.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "HousingPlacement", columnHash: 0xdebb20e3 )] - public class HousingPlacement : IExcelRow + public class HousingPlacement : ExcelRow { - public SeString Text; + public SeString Text { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Text = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/HousingPreset.cs b/src/Lumina.Excel/GeneratedSheets/HousingPreset.cs index 3e7901a6..069dc4bb 100644 --- a/src/Lumina.Excel/GeneratedSheets/HousingPreset.cs +++ b/src/Lumina.Excel/GeneratedSheets/HousingPreset.cs @@ -7,41 +7,37 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "HousingPreset", columnHash: 0x9184af18 )] - public class HousingPreset : IExcelRow + public class HousingPreset : ExcelRow { - public SeString Singular; - public sbyte Adjective; - public SeString Plural; - public sbyte PossessivePronoun; - public sbyte StartsWithVowel; - public sbyte Unknown5; - public sbyte Pronoun; - public sbyte Article; - public LazyRow< PlaceName > PlaceName; - public byte HousingSize; - public LazyRow< Item > ExteriorRoof; - public LazyRow< Item > ExteriorWall; - public LazyRow< Item > ExteriorWindow; - public LazyRow< Item > ExteriorDoor; - public LazyRow< Item > InteriorWall; - public LazyRow< Item > InteriorFlooring; - public LazyRow< Item > InteriorLighting; - public LazyRow< Item > OtherFloorWall; - public LazyRow< Item > OtherFloorFlooring; - public LazyRow< Item > OtherFloorLighting; - public LazyRow< Item > BasementWall; - public LazyRow< Item > BasementFlooring; - public LazyRow< Item > BasementLighting; - public LazyRow< Item > MansionLighting; + public SeString Singular { get; set; } + public sbyte Adjective { get; set; } + public SeString Plural { get; set; } + public sbyte PossessivePronoun { get; set; } + public sbyte StartsWithVowel { get; set; } + public sbyte Unknown5 { get; set; } + public sbyte Pronoun { get; set; } + public sbyte Article { get; set; } + public LazyRow< PlaceName > PlaceName { get; set; } + public byte HousingSize { get; set; } + public LazyRow< Item > ExteriorRoof { get; set; } + public LazyRow< Item > ExteriorWall { get; set; } + public LazyRow< Item > ExteriorWindow { get; set; } + public LazyRow< Item > ExteriorDoor { get; set; } + public LazyRow< Item > InteriorWall { get; set; } + public LazyRow< Item > InteriorFlooring { get; set; } + public LazyRow< Item > InteriorLighting { get; set; } + public LazyRow< Item > OtherFloorWall { get; set; } + public LazyRow< Item > OtherFloorFlooring { get; set; } + public LazyRow< Item > OtherFloorLighting { get; set; } + public LazyRow< Item > BasementWall { get; set; } + public LazyRow< Item > BasementFlooring { get; set; } + public LazyRow< Item > BasementLighting { get; set; } + public LazyRow< Item > MansionLighting { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Singular = parser.ReadColumn< SeString >( 0 ); Adjective = parser.ReadColumn< sbyte >( 1 ); @@ -51,22 +47,22 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) Unknown5 = parser.ReadColumn< sbyte >( 5 ); Pronoun = parser.ReadColumn< sbyte >( 6 ); Article = parser.ReadColumn< sbyte >( 7 ); - PlaceName = new LazyRow< PlaceName >( lumina, parser.ReadColumn< ushort >( 8 ), language ); + PlaceName = new LazyRow< PlaceName >( gameData, parser.ReadColumn< ushort >( 8 ), language ); HousingSize = parser.ReadColumn< byte >( 9 ); - ExteriorRoof = new LazyRow< Item >( lumina, parser.ReadColumn< int >( 10 ), language ); - ExteriorWall = new LazyRow< Item >( lumina, parser.ReadColumn< int >( 11 ), language ); - ExteriorWindow = new LazyRow< Item >( lumina, parser.ReadColumn< int >( 12 ), language ); - ExteriorDoor = new LazyRow< Item >( lumina, parser.ReadColumn< int >( 13 ), language ); - InteriorWall = new LazyRow< Item >( lumina, parser.ReadColumn< int >( 14 ), language ); - InteriorFlooring = new LazyRow< Item >( lumina, parser.ReadColumn< int >( 15 ), language ); - InteriorLighting = new LazyRow< Item >( lumina, parser.ReadColumn< int >( 16 ), language ); - OtherFloorWall = new LazyRow< Item >( lumina, parser.ReadColumn< int >( 17 ), language ); - OtherFloorFlooring = new LazyRow< Item >( lumina, parser.ReadColumn< int >( 18 ), language ); - OtherFloorLighting = new LazyRow< Item >( lumina, parser.ReadColumn< int >( 19 ), language ); - BasementWall = new LazyRow< Item >( lumina, parser.ReadColumn< int >( 20 ), language ); - BasementFlooring = new LazyRow< Item >( lumina, parser.ReadColumn< int >( 21 ), language ); - BasementLighting = new LazyRow< Item >( lumina, parser.ReadColumn< int >( 22 ), language ); - MansionLighting = new LazyRow< Item >( lumina, parser.ReadColumn< int >( 23 ), language ); + ExteriorRoof = new LazyRow< Item >( gameData, parser.ReadColumn< int >( 10 ), language ); + ExteriorWall = new LazyRow< Item >( gameData, parser.ReadColumn< int >( 11 ), language ); + ExteriorWindow = new LazyRow< Item >( gameData, parser.ReadColumn< int >( 12 ), language ); + ExteriorDoor = new LazyRow< Item >( gameData, parser.ReadColumn< int >( 13 ), language ); + InteriorWall = new LazyRow< Item >( gameData, parser.ReadColumn< int >( 14 ), language ); + InteriorFlooring = new LazyRow< Item >( gameData, parser.ReadColumn< int >( 15 ), language ); + InteriorLighting = new LazyRow< Item >( gameData, parser.ReadColumn< int >( 16 ), language ); + OtherFloorWall = new LazyRow< Item >( gameData, parser.ReadColumn< int >( 17 ), language ); + OtherFloorFlooring = new LazyRow< Item >( gameData, parser.ReadColumn< int >( 18 ), language ); + OtherFloorLighting = new LazyRow< Item >( gameData, parser.ReadColumn< int >( 19 ), language ); + BasementWall = new LazyRow< Item >( gameData, parser.ReadColumn< int >( 20 ), language ); + BasementFlooring = new LazyRow< Item >( gameData, parser.ReadColumn< int >( 21 ), language ); + BasementLighting = new LazyRow< Item >( gameData, parser.ReadColumn< int >( 22 ), language ); + MansionLighting = new LazyRow< Item >( gameData, parser.ReadColumn< int >( 23 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/HousingUnitedExterior.cs b/src/Lumina.Excel/GeneratedSheets/HousingUnitedExterior.cs index b4bb0cab..b1f6e778 100644 --- a/src/Lumina.Excel/GeneratedSheets/HousingUnitedExterior.cs +++ b/src/Lumina.Excel/GeneratedSheets/HousingUnitedExterior.cs @@ -7,24 +7,20 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "HousingUnitedExterior", columnHash: 0x88a791a7 )] - public class HousingUnitedExterior : IExcelRow + public class HousingUnitedExterior : ExcelRow { - public byte Unknown0; - public LazyRow< HousingExterior >[] Item; + public byte Unknown0 { get; set; } + public LazyRow< HousingExterior >[] Item { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< byte >( 0 ); Item = new LazyRow< HousingExterior >[ 8 ]; for( var i = 0; i < 8; i++ ) - Item[ i ] = new LazyRow< HousingExterior >( lumina, parser.ReadColumn< uint >( 1 + i ), language ); + Item[ i ] = new LazyRow< HousingExterior >( gameData, parser.ReadColumn< uint >( 1 + i ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/HousingYardObject.cs b/src/Lumina.Excel/GeneratedSheets/HousingYardObject.cs index 8cd8efa8..6b3e4639 100644 --- a/src/Lumina.Excel/GeneratedSheets/HousingYardObject.cs +++ b/src/Lumina.Excel/GeneratedSheets/HousingYardObject.cs @@ -7,39 +7,35 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "HousingYardObject", columnHash: 0xe15fd4d0 )] - public class HousingYardObject : IExcelRow + public class HousingYardObject : ExcelRow { - public byte ModelKey; - public byte HousingItemCategory; - public byte UsageType; - public uint UsageParameter; - public byte Unknown4; - public LazyRow< CustomTalk > CustomTalk; - public LazyRow< Item > Item; - public bool DestroyOnRemoval; - public bool Unknown8; - public bool Unknown9; - public byte Unknown10; - public byte Unknown11; - public byte Unknown12; - public bool Unknown13; + public byte ModelKey { get; set; } + public byte HousingItemCategory { get; set; } + public byte UsageType { get; set; } + public uint UsageParameter { get; set; } + public byte Unknown4 { get; set; } + public LazyRow< CustomTalk > CustomTalk { get; set; } + public LazyRow< Item > Item { get; set; } + public bool DestroyOnRemoval { get; set; } + public bool Unknown8 { get; set; } + public bool Unknown9 { get; set; } + public byte Unknown10 { get; set; } + public byte Unknown11 { get; set; } + public byte Unknown12 { get; set; } + public bool Unknown13 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); ModelKey = parser.ReadColumn< byte >( 0 ); HousingItemCategory = parser.ReadColumn< byte >( 1 ); UsageType = parser.ReadColumn< byte >( 2 ); UsageParameter = parser.ReadColumn< uint >( 3 ); Unknown4 = parser.ReadColumn< byte >( 4 ); - CustomTalk = new LazyRow< CustomTalk >( lumina, parser.ReadColumn< uint >( 5 ), language ); - Item = new LazyRow< Item >( lumina, parser.ReadColumn< uint >( 6 ), language ); + CustomTalk = new LazyRow< CustomTalk >( gameData, parser.ReadColumn< uint >( 5 ), language ); + Item = new LazyRow< Item >( gameData, parser.ReadColumn< uint >( 6 ), language ); DestroyOnRemoval = parser.ReadColumn< bool >( 7 ); Unknown8 = parser.ReadColumn< bool >( 8 ); Unknown9 = parser.ReadColumn< bool >( 9 ); diff --git a/src/Lumina.Excel/GeneratedSheets/HowTo.cs b/src/Lumina.Excel/GeneratedSheets/HowTo.cs index 52e9d375..d68b4095 100644 --- a/src/Lumina.Excel/GeneratedSheets/HowTo.cs +++ b/src/Lumina.Excel/GeneratedSheets/HowTo.cs @@ -7,29 +7,25 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "HowTo", columnHash: 0xe4488448 )] - public class HowTo : IExcelRow + public class HowTo : ExcelRow { - public SeString Unknown0; - public bool Unknown1; - public LazyRow< HowToPage >[] Images; - public LazyRow< HowToCategory > Category; - public byte Unknown13; + public SeString Unknown0 { get; set; } + public bool Unknown1 { get; set; } + public LazyRow< HowToPage >[] Images { get; set; } + public LazyRow< HowToCategory > Category { get; set; } + public byte Unknown13 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< SeString >( 0 ); Unknown1 = parser.ReadColumn< bool >( 1 ); Images = new LazyRow< HowToPage >[ 10 ]; for( var i = 0; i < 10; i++ ) - Images[ i ] = new LazyRow< HowToPage >( lumina, parser.ReadColumn< short >( 2 + i ), language ); - Category = new LazyRow< HowToCategory >( lumina, parser.ReadColumn< sbyte >( 12 ), language ); + Images[ i ] = new LazyRow< HowToPage >( gameData, parser.ReadColumn< short >( 2 + i ), language ); + Category = new LazyRow< HowToCategory >( gameData, parser.ReadColumn< sbyte >( 12 ), language ); Unknown13 = parser.ReadColumn< byte >( 13 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/HowToCategory.cs b/src/Lumina.Excel/GeneratedSheets/HowToCategory.cs index e5a1b333..9f991fd7 100644 --- a/src/Lumina.Excel/GeneratedSheets/HowToCategory.cs +++ b/src/Lumina.Excel/GeneratedSheets/HowToCategory.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "HowToCategory", columnHash: 0xdebb20e3 )] - public class HowToCategory : IExcelRow + public class HowToCategory : ExcelRow { - public SeString Category; + public SeString Category { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Category = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/HowToPage.cs b/src/Lumina.Excel/GeneratedSheets/HowToPage.cs index aa7ac128..510c1e2f 100644 --- a/src/Lumina.Excel/GeneratedSheets/HowToPage.cs +++ b/src/Lumina.Excel/GeneratedSheets/HowToPage.cs @@ -7,24 +7,20 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "HowToPage", columnHash: 0x006e1eac )] - public class HowToPage : IExcelRow + public class HowToPage : ExcelRow { - public byte Unknown0; - public byte Unknown1; - public int Image; - public byte Unknown3; - public SeString Unknown4; - public SeString Unknown5; - public SeString Unknown6; + public byte Unknown0 { get; set; } + public byte Unknown1 { get; set; } + public int Image { get; set; } + public byte Unknown3 { get; set; } + public SeString Unknown4 { get; set; } + public SeString Unknown5 { get; set; } + public SeString Unknown6 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< byte >( 0 ); Unknown1 = parser.ReadColumn< byte >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/HugeCraftworksNpc.cs b/src/Lumina.Excel/GeneratedSheets/HugeCraftworksNpc.cs index 01fe718a..124c6cfc 100644 --- a/src/Lumina.Excel/GeneratedSheets/HugeCraftworksNpc.cs +++ b/src/Lumina.Excel/GeneratedSheets/HugeCraftworksNpc.cs @@ -7,93 +7,89 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "HugeCraftworksNpc", columnHash: 0xb9ae7ade )] - public class HugeCraftworksNpc : IExcelRow + public class HugeCraftworksNpc : ExcelRow { - public LazyRow< ENpcResident > ENpcResident; - public LazyRow< ClassJobCategory > ClassJobCategory; - public uint Unknown2; - public LazyRow< Item >[] ItemRequested; - public uint Unknown7; - public byte Unknown8; - public byte[] QtyRequested; - public byte Unknown13; - public bool Unknown14; - public bool Unknown15; - public bool Unknown16; - public bool Unknown17; - public bool Unknown18; - public bool Unknown19; - public byte Unknown20; - public byte Unknown21; - public byte Unknown22; - public byte Unknown23; - public byte Unknown24; - public byte Unknown25; - public byte Unknown26; - public byte Unknown27; - public byte Unknown28; - public byte Unknown29; - public byte Unknown30; - public byte Unknown31; - public byte Unknown32; - public byte Unknown33; - public byte Unknown34; - public byte Unknown35; - public byte Unknown36; - public byte Unknown37; - public ushort Unknown38; - public ushort Unknown39; - public ushort Unknown40; - public ushort Unknown41; - public ushort Unknown42; - public ushort Unknown43; - public byte Unknown44; - public byte Unknown45; - public byte Unknown46; - public byte Unknown47; - public byte Unknown48; - public byte Unknown49; - public uint Unknown50; - public uint Unknown51; - public LazyRow< Item >[] ItemReward; - public bool Unknown56; - public bool Unknown57; - public bool Unknown58; - public bool Unknown59; - public bool Unknown60; - public bool Unknown61; - public byte Unknown62; - public byte Unknown63; - public byte[] QtyItemReward; - public uint Unknown68; - public uint Unknown69; - public LazyRow< Item >[] ItemUnkown; - public bool Unknown74; - public bool Unknown75; - public bool Unknown76; - public bool Unknown77; - public bool Unknown78; - public bool Unknown79; - public byte Unknown80; - public byte Unknown81; - public byte[] QtyItemUnkown; - public SeString Transient; + public LazyRow< ENpcResident > ENpcResident { get; set; } + public LazyRow< ClassJobCategory > ClassJobCategory { get; set; } + public uint Unknown2 { get; set; } + public LazyRow< Item >[] ItemRequested { get; set; } + public uint Unknown7 { get; set; } + public byte Unknown8 { get; set; } + public byte[] QtyRequested { get; set; } + public byte Unknown13 { get; set; } + public bool Unknown14 { get; set; } + public bool Unknown15 { get; set; } + public bool Unknown16 { get; set; } + public bool Unknown17 { get; set; } + public bool Unknown18 { get; set; } + public bool Unknown19 { get; set; } + public byte Unknown20 { get; set; } + public byte Unknown21 { get; set; } + public byte Unknown22 { get; set; } + public byte Unknown23 { get; set; } + public byte Unknown24 { get; set; } + public byte Unknown25 { get; set; } + public byte Unknown26 { get; set; } + public byte Unknown27 { get; set; } + public byte Unknown28 { get; set; } + public byte Unknown29 { get; set; } + public byte Unknown30 { get; set; } + public byte Unknown31 { get; set; } + public byte Unknown32 { get; set; } + public byte Unknown33 { get; set; } + public byte Unknown34 { get; set; } + public byte Unknown35 { get; set; } + public byte Unknown36 { get; set; } + public byte Unknown37 { get; set; } + public ushort Unknown38 { get; set; } + public ushort Unknown39 { get; set; } + public ushort Unknown40 { get; set; } + public ushort Unknown41 { get; set; } + public ushort Unknown42 { get; set; } + public ushort Unknown43 { get; set; } + public byte Unknown44 { get; set; } + public byte Unknown45 { get; set; } + public byte Unknown46 { get; set; } + public byte Unknown47 { get; set; } + public byte Unknown48 { get; set; } + public byte Unknown49 { get; set; } + public uint Unknown50 { get; set; } + public uint Unknown51 { get; set; } + public LazyRow< Item >[] ItemReward { get; set; } + public bool Unknown56 { get; set; } + public bool Unknown57 { get; set; } + public bool Unknown58 { get; set; } + public bool Unknown59 { get; set; } + public bool Unknown60 { get; set; } + public bool Unknown61 { get; set; } + public byte Unknown62 { get; set; } + public byte Unknown63 { get; set; } + public byte[] QtyItemReward { get; set; } + public uint Unknown68 { get; set; } + public uint Unknown69 { get; set; } + public LazyRow< Item >[] ItemUnkown { get; set; } + public bool Unknown74 { get; set; } + public bool Unknown75 { get; set; } + public bool Unknown76 { get; set; } + public bool Unknown77 { get; set; } + public bool Unknown78 { get; set; } + public bool Unknown79 { get; set; } + public byte Unknown80 { get; set; } + public byte Unknown81 { get; set; } + public byte[] QtyItemUnkown { get; set; } + public SeString Transient { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - ENpcResident = new LazyRow< ENpcResident >( lumina, parser.ReadColumn< uint >( 0 ), language ); - ClassJobCategory = new LazyRow< ClassJobCategory >( lumina, parser.ReadColumn< ushort >( 1 ), language ); + ENpcResident = new LazyRow< ENpcResident >( gameData, parser.ReadColumn< uint >( 0 ), language ); + ClassJobCategory = new LazyRow< ClassJobCategory >( gameData, parser.ReadColumn< ushort >( 1 ), language ); Unknown2 = parser.ReadColumn< uint >( 2 ); ItemRequested = new LazyRow< Item >[ 4 ]; for( var i = 0; i < 4; i++ ) - ItemRequested[ i ] = new LazyRow< Item >( lumina, parser.ReadColumn< uint >( 3 + i ), language ); + ItemRequested[ i ] = new LazyRow< Item >( gameData, parser.ReadColumn< uint >( 3 + i ), language ); Unknown7 = parser.ReadColumn< uint >( 7 ); Unknown8 = parser.ReadColumn< byte >( 8 ); QtyRequested = new byte[ 4 ]; @@ -140,7 +136,7 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) Unknown51 = parser.ReadColumn< uint >( 51 ); ItemReward = new LazyRow< Item >[ 4 ]; for( var i = 0; i < 4; i++ ) - ItemReward[ i ] = new LazyRow< Item >( lumina, parser.ReadColumn< uint >( 52 + i ), language ); + ItemReward[ i ] = new LazyRow< Item >( gameData, parser.ReadColumn< uint >( 52 + i ), language ); Unknown56 = parser.ReadColumn< bool >( 56 ); Unknown57 = parser.ReadColumn< bool >( 57 ); Unknown58 = parser.ReadColumn< bool >( 58 ); @@ -156,7 +152,7 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) Unknown69 = parser.ReadColumn< uint >( 69 ); ItemUnkown = new LazyRow< Item >[ 4 ]; for( var i = 0; i < 4; i++ ) - ItemUnkown[ i ] = new LazyRow< Item >( lumina, parser.ReadColumn< uint >( 70 + i ), language ); + ItemUnkown[ i ] = new LazyRow< Item >( gameData, parser.ReadColumn< uint >( 70 + i ), language ); Unknown74 = parser.ReadColumn< bool >( 74 ); Unknown75 = parser.ReadColumn< bool >( 75 ); Unknown76 = parser.ReadColumn< bool >( 76 ); diff --git a/src/Lumina.Excel/GeneratedSheets/HugeCraftworksRank.cs b/src/Lumina.Excel/GeneratedSheets/HugeCraftworksRank.cs index c85cd70f..5ad05f47 100644 --- a/src/Lumina.Excel/GeneratedSheets/HugeCraftworksRank.cs +++ b/src/Lumina.Excel/GeneratedSheets/HugeCraftworksRank.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "HugeCraftworksRank", columnHash: 0xf7af7ac5 )] - public class HugeCraftworksRank : IExcelRow + public class HugeCraftworksRank : ExcelRow { - public byte CrafterLevel; - public uint ExpRewardPerItem; - public byte Unknown2; + public byte CrafterLevel { get; set; } + public uint ExpRewardPerItem { get; set; } + public byte Unknown2 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); CrafterLevel = parser.ReadColumn< byte >( 0 ); ExpRewardPerItem = parser.ReadColumn< uint >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/IKDContentBonus.cs b/src/Lumina.Excel/GeneratedSheets/IKDContentBonus.cs index 99a29f6c..98b5890b 100644 --- a/src/Lumina.Excel/GeneratedSheets/IKDContentBonus.cs +++ b/src/Lumina.Excel/GeneratedSheets/IKDContentBonus.cs @@ -7,22 +7,18 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "IKDContentBonus", columnHash: 0xb7d9b7a3 )] - public class IKDContentBonus : IExcelRow + public class IKDContentBonus : ExcelRow { - public SeString Objective; - public SeString Requirement; - public ushort Unknown2; - public uint Image; - public byte Order; + public SeString Objective { get; set; } + public SeString Requirement { get; set; } + public ushort Unknown2 { get; set; } + public uint Image { get; set; } + public byte Order { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Objective = parser.ReadColumn< SeString >( 0 ); Requirement = parser.ReadColumn< SeString >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/IKDFishParam.cs b/src/Lumina.Excel/GeneratedSheets/IKDFishParam.cs index c9eaebf2..4a18beed 100644 --- a/src/Lumina.Excel/GeneratedSheets/IKDFishParam.cs +++ b/src/Lumina.Excel/GeneratedSheets/IKDFishParam.cs @@ -7,23 +7,19 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "IKDFishParam", columnHash: 0x1b55da98 )] - public class IKDFishParam : IExcelRow + public class IKDFishParam : ExcelRow { - public LazyRow< FishParameter > Fish; - public LazyRow< IKDContentBonus > IKDContentBonus; - public byte Unknown54; + public LazyRow< FishParameter > Fish { get; set; } + public LazyRow< IKDContentBonus > IKDContentBonus { get; set; } + public byte Unknown54 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Fish = new LazyRow< FishParameter >( lumina, parser.ReadColumn< uint >( 0 ), language ); - IKDContentBonus = new LazyRow< IKDContentBonus >( lumina, parser.ReadColumn< byte >( 1 ), language ); + Fish = new LazyRow< FishParameter >( gameData, parser.ReadColumn< uint >( 0 ), language ); + IKDContentBonus = new LazyRow< IKDContentBonus >( gameData, parser.ReadColumn< byte >( 1 ), language ); Unknown54 = parser.ReadColumn< byte >( 2 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/IKDRoute.cs b/src/Lumina.Excel/GeneratedSheets/IKDRoute.cs index 1172b285..5e3b2acf 100644 --- a/src/Lumina.Excel/GeneratedSheets/IKDRoute.cs +++ b/src/Lumina.Excel/GeneratedSheets/IKDRoute.cs @@ -7,29 +7,32 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "IKDRoute", columnHash: 0x9a3e7720 )] - public class IKDRoute : IExcelRow + public class IKDRoute : ExcelRow { + public struct UnkStruct0Struct + { + public uint Spot; + public byte Time; + } - public LazyRow< IKDSpot >[] Spot; - public byte TimeDefine; - public uint Image; - public LazyRow< TerritoryType > TerritoryType; - public SeString Name; + public UnkStruct0Struct[] UnkStruct0 { get; set; } + public uint Image { get; set; } + public LazyRow< TerritoryType > TerritoryType { get; set; } + public SeString Name { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Spot = new LazyRow< IKDSpot >[ 5 ]; - for( var i = 0; i < 5; i++ ) - Spot[ i ] = new LazyRow< IKDSpot >( lumina, parser.ReadColumn< uint >( 0 + i ), language ); - TimeDefine = parser.ReadColumn< byte >( 5 ); + UnkStruct0 = new UnkStruct0Struct[ 3 ]; + for( var i = 0; i < 3; i++ ) + { + UnkStruct0[ i ] = new UnkStruct0Struct(); + UnkStruct0[ i ].Spot = parser.ReadColumn< uint >( 0 + ( i * 2 + 0 ) ); + UnkStruct0[ i ].Time = parser.ReadColumn< byte >( 0 + ( i * 2 + 1 ) ); + } Image = parser.ReadColumn< uint >( 6 ); - TerritoryType = new LazyRow< TerritoryType >( lumina, parser.ReadColumn< uint >( 7 ), language ); + TerritoryType = new LazyRow< TerritoryType >( gameData, parser.ReadColumn< uint >( 7 ), language ); Name = parser.ReadColumn< SeString >( 8 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/IKDRouteTable.cs b/src/Lumina.Excel/GeneratedSheets/IKDRouteTable.cs index 69c8f1fa..df5bf614 100644 --- a/src/Lumina.Excel/GeneratedSheets/IKDRouteTable.cs +++ b/src/Lumina.Excel/GeneratedSheets/IKDRouteTable.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "IKDRouteTable", columnHash: 0xdbf43666 )] - public class IKDRouteTable : IExcelRow + public class IKDRouteTable : ExcelRow { - public LazyRow< IKDRoute > Route; + public LazyRow< IKDRoute > Route { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Route = new LazyRow< IKDRoute >( lumina, parser.ReadColumn< uint >( 0 ), language ); + Route = new LazyRow< IKDRoute >( gameData, parser.ReadColumn< uint >( 0 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/IKDSpot.cs b/src/Lumina.Excel/GeneratedSheets/IKDSpot.cs index f9c5601c..916b15be 100644 --- a/src/Lumina.Excel/GeneratedSheets/IKDSpot.cs +++ b/src/Lumina.Excel/GeneratedSheets/IKDSpot.cs @@ -7,24 +7,20 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "IKDSpot", columnHash: 0x96a22aea )] - public class IKDSpot : IExcelRow + public class IKDSpot : ExcelRow { - public LazyRow< FishingSpot > SpotMain; - public LazyRow< FishingSpot > SpotSub; - public LazyRow< PlaceName > PlaceName; + public LazyRow< FishingSpot > SpotMain { get; set; } + public LazyRow< FishingSpot > SpotSub { get; set; } + public LazyRow< PlaceName > PlaceName { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - SpotMain = new LazyRow< FishingSpot >( lumina, parser.ReadColumn< uint >( 0 ), language ); - SpotSub = new LazyRow< FishingSpot >( lumina, parser.ReadColumn< uint >( 1 ), language ); - PlaceName = new LazyRow< PlaceName >( lumina, parser.ReadColumn< uint >( 2 ), language ); + SpotMain = new LazyRow< FishingSpot >( gameData, parser.ReadColumn< uint >( 0 ), language ); + SpotSub = new LazyRow< FishingSpot >( gameData, parser.ReadColumn< uint >( 1 ), language ); + PlaceName = new LazyRow< PlaceName >( gameData, parser.ReadColumn< uint >( 2 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/InclusionShop.cs b/src/Lumina.Excel/GeneratedSheets/InclusionShop.cs index 3f135e9c..27f809fa 100644 --- a/src/Lumina.Excel/GeneratedSheets/InclusionShop.cs +++ b/src/Lumina.Excel/GeneratedSheets/InclusionShop.cs @@ -7,26 +7,22 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "InclusionShop", columnHash: 0x0ebdee42 )] - public class InclusionShop : IExcelRow + public class InclusionShop : ExcelRow { - public uint Unknown0; - public SeString Unknown1; - public LazyRow< InclusionShopCategory >[] Category; + public uint Unknown0 { get; set; } + public SeString Unknown1 { get; set; } + public LazyRow< InclusionShopCategory >[] Category { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< uint >( 0 ); Unknown1 = parser.ReadColumn< SeString >( 1 ); Category = new LazyRow< InclusionShopCategory >[ 30 ]; for( var i = 0; i < 30; i++ ) - Category[ i ] = new LazyRow< InclusionShopCategory >( lumina, parser.ReadColumn< ushort >( 2 + i ), language ); + Category[ i ] = new LazyRow< InclusionShopCategory >( gameData, parser.ReadColumn< ushort >( 2 + i ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/InclusionShopCategory.cs b/src/Lumina.Excel/GeneratedSheets/InclusionShopCategory.cs index 0ffe7fdb..27dc5cfc 100644 --- a/src/Lumina.Excel/GeneratedSheets/InclusionShopCategory.cs +++ b/src/Lumina.Excel/GeneratedSheets/InclusionShopCategory.cs @@ -7,24 +7,20 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "InclusionShopCategory", columnHash: 0x3b24d05f )] - public class InclusionShopCategory : IExcelRow + public class InclusionShopCategory : ExcelRow { - public SeString Name; - public LazyRow< ClassJobCategory > ClassJobCategory; - public LazyRow< InclusionShopSeries > InclusionShopSeries; + public SeString Name { get; set; } + public LazyRow< ClassJobCategory > ClassJobCategory { get; set; } + public LazyRow< InclusionShopSeries > InclusionShopSeries { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); - ClassJobCategory = new LazyRow< ClassJobCategory >( lumina, parser.ReadColumn< byte >( 1 ), language ); - InclusionShopSeries = new LazyRow< InclusionShopSeries >( lumina, parser.ReadColumn< ushort >( 2 ), language ); + ClassJobCategory = new LazyRow< ClassJobCategory >( gameData, parser.ReadColumn< byte >( 1 ), language ); + InclusionShopSeries = new LazyRow< InclusionShopSeries >( gameData, parser.ReadColumn< ushort >( 2 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/InclusionShopSeries.cs b/src/Lumina.Excel/GeneratedSheets/InclusionShopSeries.cs index 745b4958..0254d49f 100644 --- a/src/Lumina.Excel/GeneratedSheets/InclusionShopSeries.cs +++ b/src/Lumina.Excel/GeneratedSheets/InclusionShopSeries.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "InclusionShopSeries", columnHash: 0xdbf43666 )] - public class InclusionShopSeries : IExcelRow + public class InclusionShopSeries : ExcelRow { - public LazyRow< SpecialShop > SpecialShop; + public LazyRow< SpecialShop > SpecialShop { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - SpecialShop = new LazyRow< SpecialShop >( lumina, parser.ReadColumn< uint >( 0 ), language ); + SpecialShop = new LazyRow< SpecialShop >( gameData, parser.ReadColumn< uint >( 0 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/IndividualWeather.cs b/src/Lumina.Excel/GeneratedSheets/IndividualWeather.cs index e18d48e1..7d784176 100644 --- a/src/Lumina.Excel/GeneratedSheets/IndividualWeather.cs +++ b/src/Lumina.Excel/GeneratedSheets/IndividualWeather.cs @@ -7,39 +7,35 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "IndividualWeather", columnHash: 0x4532afe5 )] - public class IndividualWeather : IExcelRow + public class IndividualWeather : ExcelRow { - public LazyRow< Weather >[] Weather; - public byte Unknown6; - public byte Unknown7; - public byte Unknown8; - public byte Unknown9; - public byte Unknown10; - public byte Unknown11; - public byte AddedIn530; - public byte AddedIn531; - public uint Unknown14; - public LazyRow< Quest >[] Quest; - public uint Unknown21; - public uint Unknown22; - public uint Unknown23; - public uint Unknown24; - public uint Unknown25; - public uint Unknown26; - public uint Unknown27; + public LazyRow< Weather >[] Weather { get; set; } + public byte Unknown6 { get; set; } + public byte Unknown7 { get; set; } + public byte Unknown8 { get; set; } + public byte Unknown9 { get; set; } + public byte Unknown10 { get; set; } + public byte Unknown11 { get; set; } + public byte AddedIn530 { get; set; } + public byte AddedIn531 { get; set; } + public uint Unknown14 { get; set; } + public LazyRow< Quest >[] Quest { get; set; } + public uint Unknown21 { get; set; } + public uint Unknown22 { get; set; } + public uint Unknown23 { get; set; } + public uint Unknown24 { get; set; } + public uint Unknown25 { get; set; } + public uint Unknown26 { get; set; } + public uint Unknown27 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Weather = new LazyRow< Weather >[ 6 ]; for( var i = 0; i < 6; i++ ) - Weather[ i ] = new LazyRow< Weather >( lumina, parser.ReadColumn< byte >( 0 + i ), language ); + Weather[ i ] = new LazyRow< Weather >( gameData, parser.ReadColumn< byte >( 0 + i ), language ); Unknown6 = parser.ReadColumn< byte >( 6 ); Unknown7 = parser.ReadColumn< byte >( 7 ); Unknown8 = parser.ReadColumn< byte >( 8 ); @@ -51,7 +47,7 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) Unknown14 = parser.ReadColumn< uint >( 14 ); Quest = new LazyRow< Quest >[ 6 ]; for( var i = 0; i < 6; i++ ) - Quest[ i ] = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 15 + i ), language ); + Quest[ i ] = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 15 + i ), language ); Unknown21 = parser.ReadColumn< uint >( 21 ); Unknown22 = parser.ReadColumn< uint >( 22 ); Unknown23 = parser.ReadColumn< uint >( 23 ); diff --git a/src/Lumina.Excel/GeneratedSheets/InstanceContent.cs b/src/Lumina.Excel/GeneratedSheets/InstanceContent.cs index 43145390..edb601ae 100644 --- a/src/Lumina.Excel/GeneratedSheets/InstanceContent.cs +++ b/src/Lumina.Excel/GeneratedSheets/InstanceContent.cs @@ -7,7 +7,7 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "InstanceContent", columnHash: 0xa4243e29 )] - public class InstanceContent : IExcelRow + public class InstanceContent : ExcelRow { public struct UnkStruct25Struct { @@ -26,78 +26,74 @@ public struct UnkStruct40Struct public ushort BossCurrencyC; } - public byte InstanceContentType; - public byte WeekRestriction; - public ushort TimeLimitmin; - public bool Unknown3; - public LazyRow< BGM > BGM; - public LazyRow< BGM > WinBGM; - public LazyRow< Cutscene > Cutscene; - public uint Unknown7; - public ushort Order; - public byte Colosseum; - public bool Unknown10; - public LazyRow< InstanceContentTextData > InstanceContentTextDataBossStart; - public LazyRow< InstanceContentTextData > InstanceContentTextDataBossEnd; - public LazyRow< BNpcBase > BNpcBaseBoss; - public LazyRow< InstanceContentTextData > InstanceContentTextDataObjectiveStart; - public LazyRow< InstanceContentTextData > InstanceContentTextDataObjectiveEnd; - public ushort SortKey; - public uint InstanceClearExp; - public uint Unknown18; - public ushort NewPlayerBonusA; - public ushort FinalBossCurrencyC; - public uint Unknown21; - public uint FinalBossCurrencyA; - public ushort FinalBossCurrencyB; - public ushort NewPlayerBonusB; - public UnkStruct25Struct[] UnkStruct25; - public UnkStruct30Struct[] UnkStruct30; - public UnkStruct35Struct[] UnkStruct35; - public UnkStruct40Struct[] UnkStruct40; - public ushort Unknown45; - public uint InstanceClearGil; - public uint InstanceContentRewardItem; - public uint Unknown48; - public byte FinalBossExp; - public LazyRow< InstanceContentBuff > InstanceContentBuff; - public LazyRow< InstanceContent > ReqInstance; - public uint Unknown52; - public short PartyCondition; - public byte Unknown54; - public byte Unknown55; - public byte Unknown56; - public byte Unknown57; - public bool Unknown58; - public ushort Unknown59; - public ushort Unknown60; - public ushort Unknown540; - public ushort Unknown541; + public byte InstanceContentType { get; set; } + public byte WeekRestriction { get; set; } + public ushort TimeLimitmin { get; set; } + public bool Unknown3 { get; set; } + public LazyRow< BGM > BGM { get; set; } + public LazyRow< BGM > WinBGM { get; set; } + public LazyRow< Cutscene > Cutscene { get; set; } + public uint Unknown7 { get; set; } + public ushort Order { get; set; } + public byte Colosseum { get; set; } + public bool Unknown10 { get; set; } + public LazyRow< InstanceContentTextData > InstanceContentTextDataBossStart { get; set; } + public LazyRow< InstanceContentTextData > InstanceContentTextDataBossEnd { get; set; } + public LazyRow< BNpcBase > BNpcBaseBoss { get; set; } + public LazyRow< InstanceContentTextData > InstanceContentTextDataObjectiveStart { get; set; } + public LazyRow< InstanceContentTextData > InstanceContentTextDataObjectiveEnd { get; set; } + public ushort SortKey { get; set; } + public uint InstanceClearExp { get; set; } + public uint Unknown18 { get; set; } + public ushort NewPlayerBonusA { get; set; } + public ushort FinalBossCurrencyC { get; set; } + public uint Unknown21 { get; set; } + public uint FinalBossCurrencyA { get; set; } + public ushort FinalBossCurrencyB { get; set; } + public ushort NewPlayerBonusB { get; set; } + public UnkStruct25Struct[] UnkStruct25 { get; set; } + public UnkStruct30Struct[] UnkStruct30 { get; set; } + public UnkStruct35Struct[] UnkStruct35 { get; set; } + public UnkStruct40Struct[] UnkStruct40 { get; set; } + public ushort Unknown45 { get; set; } + public uint InstanceClearGil { get; set; } + public uint InstanceContentRewardItem { get; set; } + public uint Unknown48 { get; set; } + public byte FinalBossExp { get; set; } + public LazyRow< InstanceContentBuff > InstanceContentBuff { get; set; } + public LazyRow< InstanceContent > ReqInstance { get; set; } + public uint Unknown52 { get; set; } + public short PartyCondition { get; set; } + public byte Unknown54 { get; set; } + public byte Unknown55 { get; set; } + public byte Unknown56 { get; set; } + public byte Unknown57 { get; set; } + public bool Unknown58 { get; set; } + public ushort Unknown59 { get; set; } + public ushort Unknown60 { get; set; } + public ushort Unknown540 { get; set; } + public ushort Unknown541 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); InstanceContentType = parser.ReadColumn< byte >( 0 ); WeekRestriction = parser.ReadColumn< byte >( 1 ); TimeLimitmin = parser.ReadColumn< ushort >( 2 ); Unknown3 = parser.ReadColumn< bool >( 3 ); - BGM = new LazyRow< BGM >( lumina, parser.ReadColumn< ushort >( 4 ), language ); - WinBGM = new LazyRow< BGM >( lumina, parser.ReadColumn< ushort >( 5 ), language ); - Cutscene = new LazyRow< Cutscene >( lumina, parser.ReadColumn< uint >( 6 ), language ); + BGM = new LazyRow< BGM >( gameData, parser.ReadColumn< ushort >( 4 ), language ); + WinBGM = new LazyRow< BGM >( gameData, parser.ReadColumn< ushort >( 5 ), language ); + Cutscene = new LazyRow< Cutscene >( gameData, parser.ReadColumn< uint >( 6 ), language ); Unknown7 = parser.ReadColumn< uint >( 7 ); Order = parser.ReadColumn< ushort >( 8 ); Colosseum = parser.ReadColumn< byte >( 9 ); Unknown10 = parser.ReadColumn< bool >( 10 ); - InstanceContentTextDataBossStart = new LazyRow< InstanceContentTextData >( lumina, parser.ReadColumn< uint >( 11 ), language ); - InstanceContentTextDataBossEnd = new LazyRow< InstanceContentTextData >( lumina, parser.ReadColumn< uint >( 12 ), language ); - BNpcBaseBoss = new LazyRow< BNpcBase >( lumina, parser.ReadColumn< uint >( 13 ), language ); - InstanceContentTextDataObjectiveStart = new LazyRow< InstanceContentTextData >( lumina, parser.ReadColumn< uint >( 14 ), language ); - InstanceContentTextDataObjectiveEnd = new LazyRow< InstanceContentTextData >( lumina, parser.ReadColumn< uint >( 15 ), language ); + InstanceContentTextDataBossStart = new LazyRow< InstanceContentTextData >( gameData, parser.ReadColumn< uint >( 11 ), language ); + InstanceContentTextDataBossEnd = new LazyRow< InstanceContentTextData >( gameData, parser.ReadColumn< uint >( 12 ), language ); + BNpcBaseBoss = new LazyRow< BNpcBase >( gameData, parser.ReadColumn< uint >( 13 ), language ); + InstanceContentTextDataObjectiveStart = new LazyRow< InstanceContentTextData >( gameData, parser.ReadColumn< uint >( 14 ), language ); + InstanceContentTextDataObjectiveEnd = new LazyRow< InstanceContentTextData >( gameData, parser.ReadColumn< uint >( 15 ), language ); SortKey = parser.ReadColumn< ushort >( 16 ); InstanceClearExp = parser.ReadColumn< uint >( 17 ); Unknown18 = parser.ReadColumn< uint >( 18 ); @@ -136,8 +132,8 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) InstanceContentRewardItem = parser.ReadColumn< uint >( 47 ); Unknown48 = parser.ReadColumn< uint >( 48 ); FinalBossExp = parser.ReadColumn< byte >( 49 ); - InstanceContentBuff = new LazyRow< InstanceContentBuff >( lumina, parser.ReadColumn< uint >( 50 ), language ); - ReqInstance = new LazyRow< InstanceContent >( lumina, parser.ReadColumn< int >( 51 ), language ); + InstanceContentBuff = new LazyRow< InstanceContentBuff >( gameData, parser.ReadColumn< uint >( 50 ), language ); + ReqInstance = new LazyRow< InstanceContent >( gameData, parser.ReadColumn< int >( 51 ), language ); Unknown52 = parser.ReadColumn< uint >( 52 ); PartyCondition = parser.ReadColumn< short >( 53 ); Unknown54 = parser.ReadColumn< byte >( 54 ); diff --git a/src/Lumina.Excel/GeneratedSheets/InstanceContentBuff.cs b/src/Lumina.Excel/GeneratedSheets/InstanceContentBuff.cs index 6a41bfc5..37b232fb 100644 --- a/src/Lumina.Excel/GeneratedSheets/InstanceContentBuff.cs +++ b/src/Lumina.Excel/GeneratedSheets/InstanceContentBuff.cs @@ -7,19 +7,15 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "InstanceContentBuff", columnHash: 0x2020acf6 )] - public class InstanceContentBuff : IExcelRow + public class InstanceContentBuff : ExcelRow { - public ushort EchoStart; - public ushort EchoDeath; + public ushort EchoStart { get; set; } + public ushort EchoDeath { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); EchoStart = parser.ReadColumn< ushort >( 0 ); EchoDeath = parser.ReadColumn< ushort >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/InstanceContentCSBonus.cs b/src/Lumina.Excel/GeneratedSheets/InstanceContentCSBonus.cs index 70331e19..f08b2395 100644 --- a/src/Lumina.Excel/GeneratedSheets/InstanceContentCSBonus.cs +++ b/src/Lumina.Excel/GeneratedSheets/InstanceContentCSBonus.cs @@ -7,25 +7,21 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "InstanceContentCSBonus", columnHash: 0x43042e70 )] - public class InstanceContentCSBonus : IExcelRow + public class InstanceContentCSBonus : ExcelRow { - public LazyRow< InstanceContent > Instance; - public LazyRow< Item > Item; - public byte Unknown2; - public byte Unknown540; - public byte Unknown541; + public LazyRow< InstanceContent > Instance { get; set; } + public LazyRow< Item > Item { get; set; } + public byte Unknown2 { get; set; } + public byte Unknown540 { get; set; } + public byte Unknown541 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Instance = new LazyRow< InstanceContent >( lumina, parser.ReadColumn< ushort >( 0 ), language ); - Item = new LazyRow< Item >( lumina, parser.ReadColumn< uint >( 1 ), language ); + Instance = new LazyRow< InstanceContent >( gameData, parser.ReadColumn< ushort >( 0 ), language ); + Item = new LazyRow< Item >( gameData, parser.ReadColumn< uint >( 1 ), language ); Unknown2 = parser.ReadColumn< byte >( 2 ); Unknown540 = parser.ReadColumn< byte >( 3 ); Unknown541 = parser.ReadColumn< byte >( 4 ); diff --git a/src/Lumina.Excel/GeneratedSheets/InstanceContentGuide.cs b/src/Lumina.Excel/GeneratedSheets/InstanceContentGuide.cs index 3cf324fa..6f69d140 100644 --- a/src/Lumina.Excel/GeneratedSheets/InstanceContentGuide.cs +++ b/src/Lumina.Excel/GeneratedSheets/InstanceContentGuide.cs @@ -7,21 +7,17 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "InstanceContentGuide", columnHash: 0x5d58cc84 )] - public class InstanceContentGuide : IExcelRow + public class InstanceContentGuide : ExcelRow { - public LazyRow< InstanceContent > Instance; - public uint Unknown1; + public LazyRow< InstanceContent > Instance { get; set; } + public uint Unknown1 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Instance = new LazyRow< InstanceContent >( lumina, parser.ReadColumn< uint >( 0 ), language ); + Instance = new LazyRow< InstanceContent >( gameData, parser.ReadColumn< uint >( 0 ), language ); Unknown1 = parser.ReadColumn< uint >( 1 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/InstanceContentTextData.cs b/src/Lumina.Excel/GeneratedSheets/InstanceContentTextData.cs index 6ac807f2..fa09a566 100644 --- a/src/Lumina.Excel/GeneratedSheets/InstanceContentTextData.cs +++ b/src/Lumina.Excel/GeneratedSheets/InstanceContentTextData.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "InstanceContentTextData", columnHash: 0xdebb20e3 )] - public class InstanceContentTextData : IExcelRow + public class InstanceContentTextData : ExcelRow { - public SeString Text; + public SeString Text { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Text = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/Item.cs b/src/Lumina.Excel/GeneratedSheets/Item.cs index 30a1f4f7..c190de54 100644 --- a/src/Lumina.Excel/GeneratedSheets/Item.cs +++ b/src/Lumina.Excel/GeneratedSheets/Item.cs @@ -7,7 +7,7 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Item", columnHash: 0xa4a9422a )] - public class Item : IExcelRow + public class Item : ExcelRow { public struct UnkStruct60Struct { @@ -20,84 +20,80 @@ public struct UnkStruct74Struct public short BaseParamValueSpecial; } - public SeString Singular; - public sbyte Adjective; - public SeString Plural; - public sbyte PossessivePronoun; - public sbyte StartsWithVowel; - public sbyte Unknown5; - public sbyte Pronoun; - public sbyte Article; - public SeString Description; - public SeString Name; - public ushort Icon; - public LazyRow< ItemLevel > LevelItem; - public byte Rarity; - public byte FilterGroup; - public uint AdditionalData; - public LazyRow< ItemUICategory > ItemUICategory; - public LazyRow< ItemSearchCategory > ItemSearchCategory; - public LazyRow< EquipSlotCategory > EquipSlotCategory; - public LazyRow< ItemSortCategory > ItemSortCategory; - public ushort Unknown19; - public uint StackSize; - public bool IsUnique; - public bool IsUntradable; - public bool IsIndisposable; - public bool Lot; - public uint PriceMid; - public uint PriceLow; - public bool CanBeHq; - public bool IsDyeable; - public bool IsCrestWorthy; - public LazyRow< ItemAction > ItemAction; - public byte Unknown31; - public ushort Cooldowns; - public LazyRow< ClassJob > ClassJobRepair; - public LazyRow< Item > ItemRepair; - public LazyRow< Item > ItemGlamour; - public ushort Desynth; - public bool IsCollectable; - public bool AlwaysCollectable; - public ushort AetherialReduce; - public ushort Unknown54; - public byte LevelEquip; - public byte Unknown42; - public byte EquipRestriction; - public LazyRow< ClassJobCategory > ClassJobCategory; - public LazyRow< GrandCompany > GrandCompany; - public LazyRow< ItemSeries > ItemSeries; - public byte BaseParamModifier; - public ulong ModelMain; - public ulong ModelSub; - public LazyRow< ClassJob > ClassJobUse; - public byte Unknown51; - public ushort DamagePhys; - public ushort DamageMag; - public ushort Delayms; - public byte Unknown55; - public ushort BlockRate; - public ushort Block; - public ushort DefensePhys; - public ushort DefenseMag; - public UnkStruct60Struct[] UnkStruct60; - public LazyRow< ItemSpecialBonus > ItemSpecialBonus; - public byte ItemSpecialBonusParam; - public UnkStruct74Struct[] UnkStruct74; - public byte MaterializeType; - public byte MateriaSlotCount; - public bool IsAdvancedMeldingPermitted; - public bool IsPvP; - public byte Unknown90; - public bool IsGlamourous; + public SeString Singular { get; set; } + public sbyte Adjective { get; set; } + public SeString Plural { get; set; } + public sbyte PossessivePronoun { get; set; } + public sbyte StartsWithVowel { get; set; } + public sbyte Unknown5 { get; set; } + public sbyte Pronoun { get; set; } + public sbyte Article { get; set; } + public SeString Description { get; set; } + public SeString Name { get; set; } + public ushort Icon { get; set; } + public LazyRow< ItemLevel > LevelItem { get; set; } + public byte Rarity { get; set; } + public byte FilterGroup { get; set; } + public uint AdditionalData { get; set; } + public LazyRow< ItemUICategory > ItemUICategory { get; set; } + public LazyRow< ItemSearchCategory > ItemSearchCategory { get; set; } + public LazyRow< EquipSlotCategory > EquipSlotCategory { get; set; } + public LazyRow< ItemSortCategory > ItemSortCategory { get; set; } + public ushort Unknown19 { get; set; } + public uint StackSize { get; set; } + public bool IsUnique { get; set; } + public bool IsUntradable { get; set; } + public bool IsIndisposable { get; set; } + public bool Lot { get; set; } + public uint PriceMid { get; set; } + public uint PriceLow { get; set; } + public bool CanBeHq { get; set; } + public bool IsDyeable { get; set; } + public bool IsCrestWorthy { get; set; } + public LazyRow< ItemAction > ItemAction { get; set; } + public byte Unknown31 { get; set; } + public ushort Cooldowns { get; set; } + public LazyRow< ClassJob > ClassJobRepair { get; set; } + public LazyRow< Item > ItemRepair { get; set; } + public LazyRow< Item > ItemGlamour { get; set; } + public ushort Desynth { get; set; } + public bool IsCollectable { get; set; } + public bool AlwaysCollectable { get; set; } + public ushort AetherialReduce { get; set; } + public ushort Unknown54 { get; set; } + public byte LevelEquip { get; set; } + public byte Unknown42 { get; set; } + public byte EquipRestriction { get; set; } + public LazyRow< ClassJobCategory > ClassJobCategory { get; set; } + public LazyRow< GrandCompany > GrandCompany { get; set; } + public LazyRow< ItemSeries > ItemSeries { get; set; } + public byte BaseParamModifier { get; set; } + public ulong ModelMain { get; set; } + public ulong ModelSub { get; set; } + public LazyRow< ClassJob > ClassJobUse { get; set; } + public byte Unknown51 { get; set; } + public ushort DamagePhys { get; set; } + public ushort DamageMag { get; set; } + public ushort Delayms { get; set; } + public byte Unknown55 { get; set; } + public ushort BlockRate { get; set; } + public ushort Block { get; set; } + public ushort DefensePhys { get; set; } + public ushort DefenseMag { get; set; } + public UnkStruct60Struct[] UnkStruct60 { get; set; } + public LazyRow< ItemSpecialBonus > ItemSpecialBonus { get; set; } + public byte ItemSpecialBonusParam { get; set; } + public UnkStruct74Struct[] UnkStruct74 { get; set; } + public byte MaterializeType { get; set; } + public byte MateriaSlotCount { get; set; } + public bool IsAdvancedMeldingPermitted { get; set; } + public bool IsPvP { get; set; } + public byte Unknown90 { get; set; } + public bool IsGlamourous { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Singular = parser.ReadColumn< SeString >( 0 ); Adjective = parser.ReadColumn< sbyte >( 1 ); @@ -110,14 +106,14 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) Description = parser.ReadColumn< SeString >( 8 ); Name = parser.ReadColumn< SeString >( 9 ); Icon = parser.ReadColumn< ushort >( 10 ); - LevelItem = new LazyRow< ItemLevel >( lumina, parser.ReadColumn< ushort >( 11 ), language ); + LevelItem = new LazyRow< ItemLevel >( gameData, parser.ReadColumn< ushort >( 11 ), language ); Rarity = parser.ReadColumn< byte >( 12 ); FilterGroup = parser.ReadColumn< byte >( 13 ); AdditionalData = parser.ReadColumn< uint >( 14 ); - ItemUICategory = new LazyRow< ItemUICategory >( lumina, parser.ReadColumn< byte >( 15 ), language ); - ItemSearchCategory = new LazyRow< ItemSearchCategory >( lumina, parser.ReadColumn< byte >( 16 ), language ); - EquipSlotCategory = new LazyRow< EquipSlotCategory >( lumina, parser.ReadColumn< byte >( 17 ), language ); - ItemSortCategory = new LazyRow< ItemSortCategory >( lumina, parser.ReadColumn< byte >( 18 ), language ); + ItemUICategory = new LazyRow< ItemUICategory >( gameData, parser.ReadColumn< byte >( 15 ), language ); + ItemSearchCategory = new LazyRow< ItemSearchCategory >( gameData, parser.ReadColumn< byte >( 16 ), language ); + EquipSlotCategory = new LazyRow< EquipSlotCategory >( gameData, parser.ReadColumn< byte >( 17 ), language ); + ItemSortCategory = new LazyRow< ItemSortCategory >( gameData, parser.ReadColumn< byte >( 18 ), language ); Unknown19 = parser.ReadColumn< ushort >( 19 ); StackSize = parser.ReadColumn< uint >( 20 ); IsUnique = parser.ReadColumn< bool >( 21 ); @@ -129,12 +125,12 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) CanBeHq = parser.ReadColumn< bool >( 27 ); IsDyeable = parser.ReadColumn< bool >( 28 ); IsCrestWorthy = parser.ReadColumn< bool >( 29 ); - ItemAction = new LazyRow< ItemAction >( lumina, parser.ReadColumn< ushort >( 30 ), language ); + ItemAction = new LazyRow< ItemAction >( gameData, parser.ReadColumn< ushort >( 30 ), language ); Unknown31 = parser.ReadColumn< byte >( 31 ); Cooldowns = parser.ReadColumn< ushort >( 32 ); - ClassJobRepair = new LazyRow< ClassJob >( lumina, parser.ReadColumn< byte >( 33 ), language ); - ItemRepair = new LazyRow< Item >( lumina, parser.ReadColumn< int >( 34 ), language ); - ItemGlamour = new LazyRow< Item >( lumina, parser.ReadColumn< int >( 35 ), language ); + ClassJobRepair = new LazyRow< ClassJob >( gameData, parser.ReadColumn< byte >( 33 ), language ); + ItemRepair = new LazyRow< Item >( gameData, parser.ReadColumn< int >( 34 ), language ); + ItemGlamour = new LazyRow< Item >( gameData, parser.ReadColumn< int >( 35 ), language ); Desynth = parser.ReadColumn< ushort >( 36 ); IsCollectable = parser.ReadColumn< bool >( 37 ); AlwaysCollectable = parser.ReadColumn< bool >( 38 ); @@ -143,13 +139,13 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) LevelEquip = parser.ReadColumn< byte >( 41 ); Unknown42 = parser.ReadColumn< byte >( 42 ); EquipRestriction = parser.ReadColumn< byte >( 43 ); - ClassJobCategory = new LazyRow< ClassJobCategory >( lumina, parser.ReadColumn< byte >( 44 ), language ); - GrandCompany = new LazyRow< GrandCompany >( lumina, parser.ReadColumn< byte >( 45 ), language ); - ItemSeries = new LazyRow< ItemSeries >( lumina, parser.ReadColumn< byte >( 46 ), language ); + ClassJobCategory = new LazyRow< ClassJobCategory >( gameData, parser.ReadColumn< byte >( 44 ), language ); + GrandCompany = new LazyRow< GrandCompany >( gameData, parser.ReadColumn< byte >( 45 ), language ); + ItemSeries = new LazyRow< ItemSeries >( gameData, parser.ReadColumn< byte >( 46 ), language ); BaseParamModifier = parser.ReadColumn< byte >( 47 ); ModelMain = parser.ReadColumn< ulong >( 48 ); ModelSub = parser.ReadColumn< ulong >( 49 ); - ClassJobUse = new LazyRow< ClassJob >( lumina, parser.ReadColumn< byte >( 50 ), language ); + ClassJobUse = new LazyRow< ClassJob >( gameData, parser.ReadColumn< byte >( 50 ), language ); Unknown51 = parser.ReadColumn< byte >( 51 ); DamagePhys = parser.ReadColumn< ushort >( 52 ); DamageMag = parser.ReadColumn< ushort >( 53 ); @@ -166,7 +162,7 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) UnkStruct60[ i ].BaseParam = parser.ReadColumn< byte >( 60 + ( i * 2 + 0 ) ); UnkStruct60[ i ].BaseParamValue = parser.ReadColumn< short >( 60 + ( i * 2 + 1 ) ); } - ItemSpecialBonus = new LazyRow< ItemSpecialBonus >( lumina, parser.ReadColumn< byte >( 72 ), language ); + ItemSpecialBonus = new LazyRow< ItemSpecialBonus >( gameData, parser.ReadColumn< byte >( 72 ), language ); ItemSpecialBonusParam = parser.ReadColumn< byte >( 73 ); UnkStruct74 = new UnkStruct74Struct[ 6 ]; for( var i = 0; i < 6; i++ ) diff --git a/src/Lumina.Excel/GeneratedSheets/ItemAction.cs b/src/Lumina.Excel/GeneratedSheets/ItemAction.cs index ecc01d42..ef8c1a4c 100644 --- a/src/Lumina.Excel/GeneratedSheets/ItemAction.cs +++ b/src/Lumina.Excel/GeneratedSheets/ItemAction.cs @@ -7,24 +7,20 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ItemAction", columnHash: 0xb1f26af0 )] - public class ItemAction : IExcelRow + public class ItemAction : ExcelRow { - public byte CondLv; - public bool CondBattle; - public bool CondPVP; - public bool CondPVPOnly; - public ushort Type; - public ushort[] Data; - public ushort[] DataHQ; + public byte CondLv { get; set; } + public bool CondBattle { get; set; } + public bool CondPVP { get; set; } + public bool CondPVPOnly { get; set; } + public ushort Type { get; set; } + public ushort[] Data { get; set; } + public ushort[] DataHQ { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); CondLv = parser.ReadColumn< byte >( 0 ); CondBattle = parser.ReadColumn< bool >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/ItemActionTelepo.cs b/src/Lumina.Excel/GeneratedSheets/ItemActionTelepo.cs index 69713cb3..a6854bac 100644 --- a/src/Lumina.Excel/GeneratedSheets/ItemActionTelepo.cs +++ b/src/Lumina.Excel/GeneratedSheets/ItemActionTelepo.cs @@ -7,22 +7,18 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ItemActionTelepo", columnHash: 0x5d58cc84 )] - public class ItemActionTelepo : IExcelRow + public class ItemActionTelepo : ExcelRow { - public uint Requirement; - public LazyRow< LogMessage > DenyMessage; + public uint Requirement { get; set; } + public LazyRow< LogMessage > DenyMessage { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Requirement = parser.ReadColumn< uint >( 0 ); - DenyMessage = new LazyRow< LogMessage >( lumina, parser.ReadColumn< uint >( 1 ), language ); + DenyMessage = new LazyRow< LogMessage >( gameData, parser.ReadColumn< uint >( 1 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/ItemBarterCheck.cs b/src/Lumina.Excel/GeneratedSheets/ItemBarterCheck.cs index b4acf555..27478eb0 100644 --- a/src/Lumina.Excel/GeneratedSheets/ItemBarterCheck.cs +++ b/src/Lumina.Excel/GeneratedSheets/ItemBarterCheck.cs @@ -7,24 +7,20 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ItemBarterCheck", columnHash: 0x8920dbd8 )] - public class ItemBarterCheck : IExcelRow + public class ItemBarterCheck : ExcelRow { - public ushort Category; - public uint Question; - public LazyRow< Addon > Confirm; + public ushort Category { get; set; } + public uint Question { get; set; } + public LazyRow< Addon > Confirm { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Category = parser.ReadColumn< ushort >( 0 ); Question = parser.ReadColumn< uint >( 1 ); - Confirm = new LazyRow< Addon >( lumina, parser.ReadColumn< uint >( 2 ), language ); + Confirm = new LazyRow< Addon >( gameData, parser.ReadColumn< uint >( 2 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/ItemFood.cs b/src/Lumina.Excel/GeneratedSheets/ItemFood.cs index 39a01bb7..00fc027c 100644 --- a/src/Lumina.Excel/GeneratedSheets/ItemFood.cs +++ b/src/Lumina.Excel/GeneratedSheets/ItemFood.cs @@ -7,7 +7,7 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ItemFood", columnHash: 0xe09a474d )] - public class ItemFood : IExcelRow + public class ItemFood : ExcelRow { public struct UnkStruct1Struct { @@ -19,16 +19,12 @@ public struct UnkStruct1Struct public short MaxHQ; } - public byte EXPBonusPct; - public UnkStruct1Struct[] UnkStruct1; + public byte EXPBonusPct { get; set; } + public UnkStruct1Struct[] UnkStruct1 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); EXPBonusPct = parser.ReadColumn< byte >( 0 ); UnkStruct1 = new UnkStruct1Struct[ 3 ]; diff --git a/src/Lumina.Excel/GeneratedSheets/ItemLevel.cs b/src/Lumina.Excel/GeneratedSheets/ItemLevel.cs index 60cfd0e2..74e13335 100644 --- a/src/Lumina.Excel/GeneratedSheets/ItemLevel.cs +++ b/src/Lumina.Excel/GeneratedSheets/ItemLevel.cs @@ -7,91 +7,87 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ItemLevel", columnHash: 0xe216399f )] - public class ItemLevel : IExcelRow + public class ItemLevel : ExcelRow { - public ushort Strength; - public ushort Dexterity; - public ushort Vitality; - public ushort Intelligence; - public ushort Mind; - public ushort Piety; - public ushort HP; - public ushort MP; - public ushort TP; - public ushort GP; - public ushort CP; - public ushort PhysicalDamage; - public ushort MagicalDamage; - public ushort Delay; - public ushort AdditionalEffect; - public ushort AttackSpeed; - public ushort BlockRate; - public ushort BlockStrength; - public ushort Tenacity; - public ushort AttackPower; - public ushort Defense; - public ushort DirectHitRate; - public ushort Evasion; - public ushort MagicDefense; - public ushort CriticalHitPower; - public ushort CriticalHitResilience; - public ushort CriticalHit; - public ushort CriticalHitEvasion; - public ushort SlashingResistance; - public ushort PiercingResistance; - public ushort BluntResistance; - public ushort ProjectileResistance; - public ushort AttackMagicPotency; - public ushort HealingMagicPotency; - public ushort EnhancementMagicPotency; - public ushort EnfeeblingMagicPotency; - public ushort FireResistance; - public ushort IceResistance; - public ushort WindResistance; - public ushort EarthResistance; - public ushort LightningResistance; - public ushort WaterResistance; - public ushort MagicResistance; - public ushort Determination; - public ushort SkillSpeed; - public ushort SpellSpeed; - public ushort Haste; - public ushort Morale; - public ushort Enmity; - public ushort EnmityReduction; - public ushort CarefulDesynthesis; - public ushort EXPBonus; - public ushort Regen; - public ushort Refresh; - public ushort MovementSpeed; - public ushort Spikes; - public ushort SlowResistance; - public ushort PetrificationResistance; - public ushort ParalysisResistance; - public ushort SilenceResistance; - public ushort BlindResistance; - public ushort PoisonResistance; - public ushort StunResistance; - public ushort SleepResistance; - public ushort BindResistance; - public ushort HeavyResistance; - public ushort DoomResistance; - public ushort ReducedDurabilityLoss; - public ushort IncreasedSpiritbondGain; - public ushort Craftsmanship; - public ushort Control; - public ushort Gathering; - public ushort Perception; - public ushort Unknown73; + public ushort Strength { get; set; } + public ushort Dexterity { get; set; } + public ushort Vitality { get; set; } + public ushort Intelligence { get; set; } + public ushort Mind { get; set; } + public ushort Piety { get; set; } + public ushort HP { get; set; } + public ushort MP { get; set; } + public ushort TP { get; set; } + public ushort GP { get; set; } + public ushort CP { get; set; } + public ushort PhysicalDamage { get; set; } + public ushort MagicalDamage { get; set; } + public ushort Delay { get; set; } + public ushort AdditionalEffect { get; set; } + public ushort AttackSpeed { get; set; } + public ushort BlockRate { get; set; } + public ushort BlockStrength { get; set; } + public ushort Tenacity { get; set; } + public ushort AttackPower { get; set; } + public ushort Defense { get; set; } + public ushort DirectHitRate { get; set; } + public ushort Evasion { get; set; } + public ushort MagicDefense { get; set; } + public ushort CriticalHitPower { get; set; } + public ushort CriticalHitResilience { get; set; } + public ushort CriticalHit { get; set; } + public ushort CriticalHitEvasion { get; set; } + public ushort SlashingResistance { get; set; } + public ushort PiercingResistance { get; set; } + public ushort BluntResistance { get; set; } + public ushort ProjectileResistance { get; set; } + public ushort AttackMagicPotency { get; set; } + public ushort HealingMagicPotency { get; set; } + public ushort EnhancementMagicPotency { get; set; } + public ushort EnfeeblingMagicPotency { get; set; } + public ushort FireResistance { get; set; } + public ushort IceResistance { get; set; } + public ushort WindResistance { get; set; } + public ushort EarthResistance { get; set; } + public ushort LightningResistance { get; set; } + public ushort WaterResistance { get; set; } + public ushort MagicResistance { get; set; } + public ushort Determination { get; set; } + public ushort SkillSpeed { get; set; } + public ushort SpellSpeed { get; set; } + public ushort Haste { get; set; } + public ushort Morale { get; set; } + public ushort Enmity { get; set; } + public ushort EnmityReduction { get; set; } + public ushort CarefulDesynthesis { get; set; } + public ushort EXPBonus { get; set; } + public ushort Regen { get; set; } + public ushort Refresh { get; set; } + public ushort MovementSpeed { get; set; } + public ushort Spikes { get; set; } + public ushort SlowResistance { get; set; } + public ushort PetrificationResistance { get; set; } + public ushort ParalysisResistance { get; set; } + public ushort SilenceResistance { get; set; } + public ushort BlindResistance { get; set; } + public ushort PoisonResistance { get; set; } + public ushort StunResistance { get; set; } + public ushort SleepResistance { get; set; } + public ushort BindResistance { get; set; } + public ushort HeavyResistance { get; set; } + public ushort DoomResistance { get; set; } + public ushort ReducedDurabilityLoss { get; set; } + public ushort IncreasedSpiritbondGain { get; set; } + public ushort Craftsmanship { get; set; } + public ushort Control { get; set; } + public ushort Gathering { get; set; } + public ushort Perception { get; set; } + public ushort Unknown73 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Strength = parser.ReadColumn< ushort >( 0 ); Dexterity = parser.ReadColumn< ushort >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/ItemSearchCategory.cs b/src/Lumina.Excel/GeneratedSheets/ItemSearchCategory.cs index e8d9787e..ed9d5a8d 100644 --- a/src/Lumina.Excel/GeneratedSheets/ItemSearchCategory.cs +++ b/src/Lumina.Excel/GeneratedSheets/ItemSearchCategory.cs @@ -7,28 +7,24 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ItemSearchCategory", columnHash: 0xeffa5b93 )] - public class ItemSearchCategory : IExcelRow + public class ItemSearchCategory : ExcelRow { - public SeString Name; - public int Icon; - public byte Category; - public byte Order; - public LazyRow< ClassJob > ClassJob; + public SeString Name { get; set; } + public int Icon { get; set; } + public byte Category { get; set; } + public byte Order { get; set; } + public LazyRow< ClassJob > ClassJob { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); Icon = parser.ReadColumn< int >( 1 ); Category = parser.ReadColumn< byte >( 2 ); Order = parser.ReadColumn< byte >( 3 ); - ClassJob = new LazyRow< ClassJob >( lumina, parser.ReadColumn< sbyte >( 4 ), language ); + ClassJob = new LazyRow< ClassJob >( gameData, parser.ReadColumn< sbyte >( 4 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/ItemSeries.cs b/src/Lumina.Excel/GeneratedSheets/ItemSeries.cs index ad8ea97c..7b6c1f3b 100644 --- a/src/Lumina.Excel/GeneratedSheets/ItemSeries.cs +++ b/src/Lumina.Excel/GeneratedSheets/ItemSeries.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ItemSeries", columnHash: 0xdebb20e3 )] - public class ItemSeries : IExcelRow + public class ItemSeries : ExcelRow { - public SeString Name; + public SeString Name { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/ItemSortCategory.cs b/src/Lumina.Excel/GeneratedSheets/ItemSortCategory.cs index 3643d0f4..8b862a1e 100644 --- a/src/Lumina.Excel/GeneratedSheets/ItemSortCategory.cs +++ b/src/Lumina.Excel/GeneratedSheets/ItemSortCategory.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ItemSortCategory", columnHash: 0xdcfd9eba )] - public class ItemSortCategory : IExcelRow + public class ItemSortCategory : ExcelRow { - public byte Param; + public byte Param { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Param = parser.ReadColumn< byte >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/ItemSpecialBonus.cs b/src/Lumina.Excel/GeneratedSheets/ItemSpecialBonus.cs index 72f27f42..3e2e833e 100644 --- a/src/Lumina.Excel/GeneratedSheets/ItemSpecialBonus.cs +++ b/src/Lumina.Excel/GeneratedSheets/ItemSpecialBonus.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ItemSpecialBonus", columnHash: 0xdebb20e3 )] - public class ItemSpecialBonus : IExcelRow + public class ItemSpecialBonus : ExcelRow { - public SeString Name; + public SeString Name { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/ItemUICategory.cs b/src/Lumina.Excel/GeneratedSheets/ItemUICategory.cs index 6c32883c..bfbd96bc 100644 --- a/src/Lumina.Excel/GeneratedSheets/ItemUICategory.cs +++ b/src/Lumina.Excel/GeneratedSheets/ItemUICategory.cs @@ -7,21 +7,17 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ItemUICategory", columnHash: 0xdc1f7844 )] - public class ItemUICategory : IExcelRow + public class ItemUICategory : ExcelRow { - public SeString Name; - public int Icon; - public byte OrderMinor; - public byte OrderMajor; + public SeString Name { get; set; } + public int Icon { get; set; } + public byte OrderMinor { get; set; } + public byte OrderMajor { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); Icon = parser.ReadColumn< int >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/JobHudManual.cs b/src/Lumina.Excel/GeneratedSheets/JobHudManual.cs index 9f866b9a..a8bab813 100644 --- a/src/Lumina.Excel/GeneratedSheets/JobHudManual.cs +++ b/src/Lumina.Excel/GeneratedSheets/JobHudManual.cs @@ -7,30 +7,26 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "JobHudManual", columnHash: 0x21d1dec2 )] - public class JobHudManual : IExcelRow + public class JobHudManual : ExcelRow { - public byte Unknown0; - public byte Unknown1; - public LazyRow< Action > Action; - public byte Unknown3; - public uint Unknown4; - public LazyRow< Guide > Guide; + public byte Unknown0 { get; set; } + public byte Unknown1 { get; set; } + public LazyRow< Action > Action { get; set; } + public byte Unknown3 { get; set; } + public uint Unknown4 { get; set; } + public LazyRow< Guide > Guide { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< byte >( 0 ); Unknown1 = parser.ReadColumn< byte >( 1 ); - Action = new LazyRow< Action >( lumina, parser.ReadColumn< uint >( 2 ), language ); + Action = new LazyRow< Action >( gameData, parser.ReadColumn< uint >( 2 ), language ); Unknown3 = parser.ReadColumn< byte >( 3 ); Unknown4 = parser.ReadColumn< uint >( 4 ); - Guide = new LazyRow< Guide >( lumina, parser.ReadColumn< ushort >( 5 ), language ); + Guide = new LazyRow< Guide >( gameData, parser.ReadColumn< ushort >( 5 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/JobHudManualPriority.cs b/src/Lumina.Excel/GeneratedSheets/JobHudManualPriority.cs index 68c3d89d..da397b9d 100644 --- a/src/Lumina.Excel/GeneratedSheets/JobHudManualPriority.cs +++ b/src/Lumina.Excel/GeneratedSheets/JobHudManualPriority.cs @@ -7,24 +7,20 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "JobHudManualPriority", columnHash: 0x5be005ad )] - public class JobHudManualPriority : IExcelRow + public class JobHudManualPriority : ExcelRow { - public LazyRow< JobHudManual >[] JobHudManual; - public byte Unknown3; - public byte Unknown4; + public LazyRow< JobHudManual >[] JobHudManual { get; set; } + public byte Unknown3 { get; set; } + public byte Unknown4 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); JobHudManual = new LazyRow< JobHudManual >[ 3 ]; for( var i = 0; i < 3; i++ ) - JobHudManual[ i ] = new LazyRow< JobHudManual >( lumina, parser.ReadColumn< byte >( 0 + i ), language ); + JobHudManual[ i ] = new LazyRow< JobHudManual >( gameData, parser.ReadColumn< byte >( 0 + i ), language ); Unknown3 = parser.ReadColumn< byte >( 3 ); Unknown4 = parser.ReadColumn< byte >( 4 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/JournalCategory.cs b/src/Lumina.Excel/GeneratedSheets/JournalCategory.cs index ae68669b..6968f6ac 100644 --- a/src/Lumina.Excel/GeneratedSheets/JournalCategory.cs +++ b/src/Lumina.Excel/GeneratedSheets/JournalCategory.cs @@ -7,26 +7,22 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "JournalCategory", columnHash: 0xc5670d26 )] - public class JournalCategory : IExcelRow + public class JournalCategory : ExcelRow { - public SeString Name; - public byte SeparateType; - public byte DataType; - public LazyRow< JournalSection > JournalSection; + public SeString Name { get; set; } + public byte SeparateType { get; set; } + public byte DataType { get; set; } + public LazyRow< JournalSection > JournalSection { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); SeparateType = parser.ReadColumn< byte >( 1 ); DataType = parser.ReadColumn< byte >( 2 ); - JournalSection = new LazyRow< JournalSection >( lumina, parser.ReadColumn< byte >( 3 ), language ); + JournalSection = new LazyRow< JournalSection >( gameData, parser.ReadColumn< byte >( 3 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/JournalGenre.cs b/src/Lumina.Excel/GeneratedSheets/JournalGenre.cs index 85b8626a..fdf62f36 100644 --- a/src/Lumina.Excel/GeneratedSheets/JournalGenre.cs +++ b/src/Lumina.Excel/GeneratedSheets/JournalGenre.cs @@ -7,24 +7,20 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "JournalGenre", columnHash: 0x2c6b75bb )] - public class JournalGenre : IExcelRow + public class JournalGenre : ExcelRow { - public int Icon; - public LazyRow< JournalCategory > JournalCategory; - public bool Unknown2; - public SeString Name; + public int Icon { get; set; } + public LazyRow< JournalCategory > JournalCategory { get; set; } + public bool Unknown2 { get; set; } + public SeString Name { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Icon = parser.ReadColumn< int >( 0 ); - JournalCategory = new LazyRow< JournalCategory >( lumina, parser.ReadColumn< byte >( 1 ), language ); + JournalCategory = new LazyRow< JournalCategory >( gameData, parser.ReadColumn< byte >( 1 ), language ); Unknown2 = parser.ReadColumn< bool >( 2 ); Name = parser.ReadColumn< SeString >( 3 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/JournalSection.cs b/src/Lumina.Excel/GeneratedSheets/JournalSection.cs index ccef3443..00b003f5 100644 --- a/src/Lumina.Excel/GeneratedSheets/JournalSection.cs +++ b/src/Lumina.Excel/GeneratedSheets/JournalSection.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "JournalSection", columnHash: 0x9530a4f2 )] - public class JournalSection : IExcelRow + public class JournalSection : ExcelRow { - public SeString Name; - public bool Unknown1; - public bool Unknown2; + public SeString Name { get; set; } + public bool Unknown1 { get; set; } + public bool Unknown2 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); Unknown1 = parser.ReadColumn< bool >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/Knockback.cs b/src/Lumina.Excel/GeneratedSheets/Knockback.cs index 8035efad..173cd390 100644 --- a/src/Lumina.Excel/GeneratedSheets/Knockback.cs +++ b/src/Lumina.Excel/GeneratedSheets/Knockback.cs @@ -7,24 +7,20 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Knockback", columnHash: 0x6876beaf )] - public class Knockback : IExcelRow + public class Knockback : ExcelRow { - public byte Distance; - public byte Speed; - public bool Motion; - public byte NearDistance; - public byte Direction; - public byte DirectionArg; - public bool CancelMove; + public byte Distance { get; set; } + public byte Speed { get; set; } + public bool Motion { get; set; } + public byte NearDistance { get; set; } + public byte Direction { get; set; } + public byte DirectionArg { get; set; } + public bool CancelMove { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Distance = parser.ReadColumn< byte >( 0 ); Speed = parser.ReadColumn< byte >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/LegacyQuest.cs b/src/Lumina.Excel/GeneratedSheets/LegacyQuest.cs index a2408234..afc53d5f 100644 --- a/src/Lumina.Excel/GeneratedSheets/LegacyQuest.cs +++ b/src/Lumina.Excel/GeneratedSheets/LegacyQuest.cs @@ -7,22 +7,18 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "LegacyQuest", columnHash: 0x6624322e )] - public class LegacyQuest : IExcelRow + public class LegacyQuest : ExcelRow { - public ushort LegacyQuestID; - public SeString Text; - public SeString String; - public ushort SortKey; - public byte Genre; + public ushort LegacyQuestID { get; set; } + public SeString Text { get; set; } + public SeString String { get; set; } + public ushort SortKey { get; set; } + public byte Genre { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); LegacyQuestID = parser.ReadColumn< ushort >( 0 ); Text = parser.ReadColumn< SeString >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/Leve.cs b/src/Lumina.Excel/GeneratedSheets/Leve.cs index 12f7552c..f9dbbd16 100644 --- a/src/Lumina.Excel/GeneratedSheets/Leve.cs +++ b/src/Lumina.Excel/GeneratedSheets/Leve.cs @@ -7,67 +7,63 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Leve", columnHash: 0x745e3c08 )] - public class Leve : IExcelRow + public class Leve : ExcelRow { - public SeString Name; - public SeString Description; - public LazyRow< LeveClient > LeveClient; - public LazyRow< LeveAssignmentType > LeveAssignmentType; - public LazyRow< Town > Town; - public int Unknown5; - public ushort ClassJobLevel; - public byte TimeLimit; - public byte AllowanceCost; - public int Evaluation; - public LazyRow< PlaceName > PlaceNameStart; - public LazyRow< PlaceName > PlaceNameIssued; - public bool Unknown12; - public LazyRow< ClassJobCategory > ClassJobCategory; - public LazyRow< JournalGenre > JournalGenre; - public int Unknown15; - public LazyRow< PlaceName > PlaceNameStartZone; - public int IconCityState; - public int DataId; - public bool CanCancel; - public byte MaxDifficulty; - public float ExpFactor; - public uint ExpReward; - public uint GilReward; - public LazyRow< LeveRewardItem > LeveRewardItem; - public LazyRow< LeveVfx > LeveVfx; - public LazyRow< LeveVfx > LeveVfxFrame; - public LazyRow< Level > LevelLevemete; - public int IconIssuer; - public bool LockedLeve; - public LazyRow< Level > LevelStart; - public LazyRow< BGM > BGM; + public SeString Name { get; set; } + public SeString Description { get; set; } + public LazyRow< LeveClient > LeveClient { get; set; } + public LazyRow< LeveAssignmentType > LeveAssignmentType { get; set; } + public LazyRow< Town > Town { get; set; } + public int Unknown5 { get; set; } + public ushort ClassJobLevel { get; set; } + public byte TimeLimit { get; set; } + public byte AllowanceCost { get; set; } + public int Evaluation { get; set; } + public LazyRow< PlaceName > PlaceNameStart { get; set; } + public LazyRow< PlaceName > PlaceNameIssued { get; set; } + public bool Unknown12 { get; set; } + public LazyRow< ClassJobCategory > ClassJobCategory { get; set; } + public LazyRow< JournalGenre > JournalGenre { get; set; } + public int Unknown15 { get; set; } + public LazyRow< PlaceName > PlaceNameStartZone { get; set; } + public int IconCityState { get; set; } + public int DataId { get; set; } + public bool CanCancel { get; set; } + public byte MaxDifficulty { get; set; } + public float ExpFactor { get; set; } + public uint ExpReward { get; set; } + public uint GilReward { get; set; } + public LazyRow< LeveRewardItem > LeveRewardItem { get; set; } + public LazyRow< LeveVfx > LeveVfx { get; set; } + public LazyRow< LeveVfx > LeveVfxFrame { get; set; } + public LazyRow< Level > LevelLevemete { get; set; } + public int IconIssuer { get; set; } + public bool LockedLeve { get; set; } + public LazyRow< Level > LevelStart { get; set; } + public LazyRow< BGM > BGM { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); Description = parser.ReadColumn< SeString >( 1 ); - LeveClient = new LazyRow< LeveClient >( lumina, parser.ReadColumn< int >( 2 ), language ); - LeveAssignmentType = new LazyRow< LeveAssignmentType >( lumina, parser.ReadColumn< byte >( 3 ), language ); - Town = new LazyRow< Town >( lumina, parser.ReadColumn< int >( 4 ), language ); + LeveClient = new LazyRow< LeveClient >( gameData, parser.ReadColumn< int >( 2 ), language ); + LeveAssignmentType = new LazyRow< LeveAssignmentType >( gameData, parser.ReadColumn< byte >( 3 ), language ); + Town = new LazyRow< Town >( gameData, parser.ReadColumn< int >( 4 ), language ); Unknown5 = parser.ReadColumn< int >( 5 ); ClassJobLevel = parser.ReadColumn< ushort >( 6 ); TimeLimit = parser.ReadColumn< byte >( 7 ); AllowanceCost = parser.ReadColumn< byte >( 8 ); Evaluation = parser.ReadColumn< int >( 9 ); - PlaceNameStart = new LazyRow< PlaceName >( lumina, parser.ReadColumn< int >( 10 ), language ); - PlaceNameIssued = new LazyRow< PlaceName >( lumina, parser.ReadColumn< int >( 11 ), language ); + PlaceNameStart = new LazyRow< PlaceName >( gameData, parser.ReadColumn< int >( 10 ), language ); + PlaceNameIssued = new LazyRow< PlaceName >( gameData, parser.ReadColumn< int >( 11 ), language ); Unknown12 = parser.ReadColumn< bool >( 12 ); - ClassJobCategory = new LazyRow< ClassJobCategory >( lumina, parser.ReadColumn< byte >( 13 ), language ); - JournalGenre = new LazyRow< JournalGenre >( lumina, parser.ReadColumn< int >( 14 ), language ); + ClassJobCategory = new LazyRow< ClassJobCategory >( gameData, parser.ReadColumn< byte >( 13 ), language ); + JournalGenre = new LazyRow< JournalGenre >( gameData, parser.ReadColumn< int >( 14 ), language ); Unknown15 = parser.ReadColumn< int >( 15 ); - PlaceNameStartZone = new LazyRow< PlaceName >( lumina, parser.ReadColumn< int >( 16 ), language ); + PlaceNameStartZone = new LazyRow< PlaceName >( gameData, parser.ReadColumn< int >( 16 ), language ); IconCityState = parser.ReadColumn< int >( 17 ); DataId = parser.ReadColumn< int >( 18 ); CanCancel = parser.ReadColumn< bool >( 19 ); @@ -75,14 +71,14 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) ExpFactor = parser.ReadColumn< float >( 21 ); ExpReward = parser.ReadColumn< uint >( 22 ); GilReward = parser.ReadColumn< uint >( 23 ); - LeveRewardItem = new LazyRow< LeveRewardItem >( lumina, parser.ReadColumn< ushort >( 24 ), language ); - LeveVfx = new LazyRow< LeveVfx >( lumina, parser.ReadColumn< byte >( 25 ), language ); - LeveVfxFrame = new LazyRow< LeveVfx >( lumina, parser.ReadColumn< byte >( 26 ), language ); - LevelLevemete = new LazyRow< Level >( lumina, parser.ReadColumn< uint >( 27 ), language ); + LeveRewardItem = new LazyRow< LeveRewardItem >( gameData, parser.ReadColumn< ushort >( 24 ), language ); + LeveVfx = new LazyRow< LeveVfx >( gameData, parser.ReadColumn< byte >( 25 ), language ); + LeveVfxFrame = new LazyRow< LeveVfx >( gameData, parser.ReadColumn< byte >( 26 ), language ); + LevelLevemete = new LazyRow< Level >( gameData, parser.ReadColumn< uint >( 27 ), language ); IconIssuer = parser.ReadColumn< int >( 28 ); LockedLeve = parser.ReadColumn< bool >( 29 ); - LevelStart = new LazyRow< Level >( lumina, parser.ReadColumn< uint >( 30 ), language ); - BGM = new LazyRow< BGM >( lumina, parser.ReadColumn< ushort >( 31 ), language ); + LevelStart = new LazyRow< Level >( gameData, parser.ReadColumn< uint >( 30 ), language ); + BGM = new LazyRow< BGM >( gameData, parser.ReadColumn< ushort >( 31 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/LeveAssignmentType.cs b/src/Lumina.Excel/GeneratedSheets/LeveAssignmentType.cs index 3ed7054d..099b316b 100644 --- a/src/Lumina.Excel/GeneratedSheets/LeveAssignmentType.cs +++ b/src/Lumina.Excel/GeneratedSheets/LeveAssignmentType.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "LeveAssignmentType", columnHash: 0x7c19f23c )] - public class LeveAssignmentType : IExcelRow + public class LeveAssignmentType : ExcelRow { - public bool IsFaction; - public int Icon; - public SeString Name; + public bool IsFaction { get; set; } + public int Icon { get; set; } + public SeString Name { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); IsFaction = parser.ReadColumn< bool >( 0 ); Icon = parser.ReadColumn< int >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/LeveClient.cs b/src/Lumina.Excel/GeneratedSheets/LeveClient.cs index 95ca5ed3..8ab8bdef 100644 --- a/src/Lumina.Excel/GeneratedSheets/LeveClient.cs +++ b/src/Lumina.Excel/GeneratedSheets/LeveClient.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "LeveClient", columnHash: 0xdebb20e3 )] - public class LeveClient : IExcelRow + public class LeveClient : ExcelRow { - public SeString Name; + public SeString Name { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/LeveRewardItem.cs b/src/Lumina.Excel/GeneratedSheets/LeveRewardItem.cs index 253d4479..ea7b6aa1 100644 --- a/src/Lumina.Excel/GeneratedSheets/LeveRewardItem.cs +++ b/src/Lumina.Excel/GeneratedSheets/LeveRewardItem.cs @@ -7,7 +7,7 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "LeveRewardItem", columnHash: 0x00035bbe )] - public class LeveRewardItem : IExcelRow + public class LeveRewardItem : ExcelRow { public struct UnkStruct0Struct { @@ -15,15 +15,11 @@ public struct UnkStruct0Struct public byte ProbabilityPct; } - public UnkStruct0Struct[] UnkStruct0; + public UnkStruct0Struct[] UnkStruct0 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); UnkStruct0 = new UnkStruct0Struct[ 8 ]; for( var i = 0; i < 8; i++ ) diff --git a/src/Lumina.Excel/GeneratedSheets/LeveRewardItemGroup.cs b/src/Lumina.Excel/GeneratedSheets/LeveRewardItemGroup.cs index f3aa2499..a183a88f 100644 --- a/src/Lumina.Excel/GeneratedSheets/LeveRewardItemGroup.cs +++ b/src/Lumina.Excel/GeneratedSheets/LeveRewardItemGroup.cs @@ -7,7 +7,7 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "LeveRewardItemGroup", columnHash: 0xf065e622 )] - public class LeveRewardItemGroup : IExcelRow + public class LeveRewardItemGroup : ExcelRow { public struct UnkStruct0Struct { @@ -16,15 +16,11 @@ public struct UnkStruct0Struct public bool HQ; } - public UnkStruct0Struct[] UnkStruct0; + public UnkStruct0Struct[] UnkStruct0 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); UnkStruct0 = new UnkStruct0Struct[ 9 ]; for( var i = 0; i < 9; i++ ) diff --git a/src/Lumina.Excel/GeneratedSheets/LeveString.cs b/src/Lumina.Excel/GeneratedSheets/LeveString.cs index b1d7ed73..54b448c3 100644 --- a/src/Lumina.Excel/GeneratedSheets/LeveString.cs +++ b/src/Lumina.Excel/GeneratedSheets/LeveString.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "LeveString", columnHash: 0xdebb20e3 )] - public class LeveString : IExcelRow + public class LeveString : ExcelRow { - public SeString Objective; + public SeString Objective { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Objective = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/LeveVfx.cs b/src/Lumina.Excel/GeneratedSheets/LeveVfx.cs index dee1f7bd..f59b4443 100644 --- a/src/Lumina.Excel/GeneratedSheets/LeveVfx.cs +++ b/src/Lumina.Excel/GeneratedSheets/LeveVfx.cs @@ -7,19 +7,15 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "LeveVfx", columnHash: 0x993d983d )] - public class LeveVfx : IExcelRow + public class LeveVfx : ExcelRow { - public SeString Effect; - public int Icon; + public SeString Effect { get; set; } + public int Icon { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Effect = parser.ReadColumn< SeString >( 0 ); Icon = parser.ReadColumn< int >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/Level.cs b/src/Lumina.Excel/GeneratedSheets/Level.cs index 441158e2..1f25f647 100644 --- a/src/Lumina.Excel/GeneratedSheets/Level.cs +++ b/src/Lumina.Excel/GeneratedSheets/Level.cs @@ -7,27 +7,23 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Level", columnHash: 0xd3d8d868 )] - public class Level : IExcelRow + public class Level : ExcelRow { - public float X; - public float Y; - public float Z; - public float Yaw; - public float Radius; - public byte Type; - public uint Object; - public LazyRow< Map > Map; - public uint EventId; - public LazyRow< TerritoryType > Territory; + public float X { get; set; } + public float Y { get; set; } + public float Z { get; set; } + public float Yaw { get; set; } + public float Radius { get; set; } + public byte Type { get; set; } + public uint Object { get; set; } + public LazyRow< Map > Map { get; set; } + public uint EventId { get; set; } + public LazyRow< TerritoryType > Territory { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); X = parser.ReadColumn< float >( 0 ); Y = parser.ReadColumn< float >( 1 ); @@ -36,9 +32,9 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) Radius = parser.ReadColumn< float >( 4 ); Type = parser.ReadColumn< byte >( 5 ); Object = parser.ReadColumn< uint >( 6 ); - Map = new LazyRow< Map >( lumina, parser.ReadColumn< ushort >( 7 ), language ); + Map = new LazyRow< Map >( gameData, parser.ReadColumn< ushort >( 7 ), language ); EventId = parser.ReadColumn< uint >( 8 ); - Territory = new LazyRow< TerritoryType >( lumina, parser.ReadColumn< ushort >( 9 ), language ); + Territory = new LazyRow< TerritoryType >( gameData, parser.ReadColumn< ushort >( 9 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/Lobby.cs b/src/Lumina.Excel/GeneratedSheets/Lobby.cs index 02b55017..ddc06f14 100644 --- a/src/Lumina.Excel/GeneratedSheets/Lobby.cs +++ b/src/Lumina.Excel/GeneratedSheets/Lobby.cs @@ -7,23 +7,19 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Lobby", columnHash: 0x54075f2e )] - public class Lobby : IExcelRow + public class Lobby : ExcelRow { - public uint TYPE; - public uint PARAM; - public uint LINK; - public SeString Text; - public SeString Unknown4; - public SeString Unknown5; + public uint TYPE { get; set; } + public uint PARAM { get; set; } + public uint LINK { get; set; } + public SeString Text { get; set; } + public SeString Unknown4 { get; set; } + public SeString Unknown5 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); TYPE = parser.ReadColumn< uint >( 0 ); PARAM = parser.ReadColumn< uint >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/LogFilter.cs b/src/Lumina.Excel/GeneratedSheets/LogFilter.cs index cd0a32a6..0e61de4c 100644 --- a/src/Lumina.Excel/GeneratedSheets/LogFilter.cs +++ b/src/Lumina.Excel/GeneratedSheets/LogFilter.cs @@ -7,25 +7,21 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "LogFilter", columnHash: 0x6ef5ba16 )] - public class LogFilter : IExcelRow + public class LogFilter : ExcelRow { - public byte LogKind; - public ushort Caster; - public ushort Target; - public byte Category; - public byte DisplayOrder; - public byte Preset; - public SeString Name; - public SeString Example; + public byte LogKind { get; set; } + public ushort Caster { get; set; } + public ushort Target { get; set; } + public byte Category { get; set; } + public byte DisplayOrder { get; set; } + public byte Preset { get; set; } + public SeString Name { get; set; } + public SeString Example { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); LogKind = parser.ReadColumn< byte >( 0 ); Caster = parser.ReadColumn< ushort >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/LogKind.cs b/src/Lumina.Excel/GeneratedSheets/LogKind.cs index c6034f97..07a24682 100644 --- a/src/Lumina.Excel/GeneratedSheets/LogKind.cs +++ b/src/Lumina.Excel/GeneratedSheets/LogKind.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "LogKind", columnHash: 0x23b962ed )] - public class LogKind : IExcelRow + public class LogKind : ExcelRow { - public byte Unknown0; - public SeString Format; - public bool Unknown2; + public byte Unknown0 { get; set; } + public SeString Format { get; set; } + public bool Unknown2 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< byte >( 0 ); Format = parser.ReadColumn< SeString >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/LogMessage.cs b/src/Lumina.Excel/GeneratedSheets/LogMessage.cs index 1dab3ae8..49e8a3b0 100644 --- a/src/Lumina.Excel/GeneratedSheets/LogMessage.cs +++ b/src/Lumina.Excel/GeneratedSheets/LogMessage.cs @@ -7,22 +7,18 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "LogMessage", columnHash: 0xf3a6d024 )] - public class LogMessage : IExcelRow + public class LogMessage : ExcelRow { - public ushort LogKind; - public ushort Unknown1; - public byte Unknown2; - public bool Unknown3; - public SeString Text; + public ushort LogKind { get; set; } + public ushort Unknown1 { get; set; } + public byte Unknown2 { get; set; } + public bool Unknown3 { get; set; } + public SeString Text { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); LogKind = parser.ReadColumn< ushort >( 0 ); Unknown1 = parser.ReadColumn< ushort >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/LotteryExchangeShop.cs b/src/Lumina.Excel/GeneratedSheets/LotteryExchangeShop.cs index 107842c5..2c7caefe 100644 --- a/src/Lumina.Excel/GeneratedSheets/LotteryExchangeShop.cs +++ b/src/Lumina.Excel/GeneratedSheets/LotteryExchangeShop.cs @@ -7,30 +7,26 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "LotteryExchangeShop", columnHash: 0xfd7b4ce5 )] - public class LotteryExchangeShop : IExcelRow + public class LotteryExchangeShop : ExcelRow { - public SeString Unknown0; - public LazyRow< Item >[] ItemAccepted; - public uint[] AmountAccepted; - public byte[] Unknown540; - public byte[] Unknown541; - public SeString Lua; - public LazyRow< LogMessage >[] LogMessage; - public bool Unknown133; + public SeString Unknown0 { get; set; } + public LazyRow< Item >[] ItemAccepted { get; set; } + public uint[] AmountAccepted { get; set; } + public byte[] Unknown540 { get; set; } + public byte[] Unknown541 { get; set; } + public SeString Lua { get; set; } + public LazyRow< LogMessage >[] LogMessage { get; set; } + public bool Unknown133 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< SeString >( 0 ); ItemAccepted = new LazyRow< Item >[ 32 ]; for( var i = 0; i < 32; i++ ) - ItemAccepted[ i ] = new LazyRow< Item >( lumina, parser.ReadColumn< int >( 1 + i ), language ); + ItemAccepted[ i ] = new LazyRow< Item >( gameData, parser.ReadColumn< int >( 1 + i ), language ); AmountAccepted = new uint[ 32 ]; for( var i = 0; i < 32; i++ ) AmountAccepted[ i ] = parser.ReadColumn< uint >( 33 + i ); @@ -43,7 +39,7 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) Lua = parser.ReadColumn< SeString >( 129 ); LogMessage = new LazyRow< LogMessage >[ 3 ]; for( var i = 0; i < 3; i++ ) - LogMessage[ i ] = new LazyRow< LogMessage >( lumina, parser.ReadColumn< uint >( 130 + i ), language ); + LogMessage[ i ] = new LazyRow< LogMessage >( gameData, parser.ReadColumn< uint >( 130 + i ), language ); Unknown133 = parser.ReadColumn< bool >( 133 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/MYCTemporaryItem.cs b/src/Lumina.Excel/GeneratedSheets/MYCTemporaryItem.cs index a4083e7b..7dd72e53 100644 --- a/src/Lumina.Excel/GeneratedSheets/MYCTemporaryItem.cs +++ b/src/Lumina.Excel/GeneratedSheets/MYCTemporaryItem.cs @@ -7,27 +7,23 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "MYCTemporaryItem", columnHash: 0x9176820b )] - public class MYCTemporaryItem : IExcelRow + public class MYCTemporaryItem : ExcelRow { - public LazyRow< MYCTemporaryItemUICategory > Category; - public byte Type; - public LazyRow< Action > Action; - public byte Max; - public byte Weight; - public byte Order; + public LazyRow< MYCTemporaryItemUICategory > Category { get; set; } + public byte Type { get; set; } + public LazyRow< Action > Action { get; set; } + public byte Max { get; set; } + public byte Weight { get; set; } + public byte Order { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Category = new LazyRow< MYCTemporaryItemUICategory >( lumina, parser.ReadColumn< byte >( 0 ), language ); + Category = new LazyRow< MYCTemporaryItemUICategory >( gameData, parser.ReadColumn< byte >( 0 ), language ); Type = parser.ReadColumn< byte >( 1 ); - Action = new LazyRow< Action >( lumina, parser.ReadColumn< uint >( 2 ), language ); + Action = new LazyRow< Action >( gameData, parser.ReadColumn< uint >( 2 ), language ); Max = parser.ReadColumn< byte >( 3 ); Weight = parser.ReadColumn< byte >( 4 ); Order = parser.ReadColumn< byte >( 5 ); diff --git a/src/Lumina.Excel/GeneratedSheets/MYCTemporaryItemUICategory.cs b/src/Lumina.Excel/GeneratedSheets/MYCTemporaryItemUICategory.cs index c4cd9cb9..e23c74b8 100644 --- a/src/Lumina.Excel/GeneratedSheets/MYCTemporaryItemUICategory.cs +++ b/src/Lumina.Excel/GeneratedSheets/MYCTemporaryItemUICategory.cs @@ -7,19 +7,15 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "MYCTemporaryItemUICategory", columnHash: 0x9db0e48f )] - public class MYCTemporaryItemUICategory : IExcelRow + public class MYCTemporaryItemUICategory : ExcelRow { - public SeString Name; - public SeString Unknown1; + public SeString Name { get; set; } + public SeString Unknown1 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); Unknown1 = parser.ReadColumn< SeString >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/MYCWarResultNotebook.cs b/src/Lumina.Excel/GeneratedSheets/MYCWarResultNotebook.cs index 2a1d81bd..f516a1a7 100644 --- a/src/Lumina.Excel/GeneratedSheets/MYCWarResultNotebook.cs +++ b/src/Lumina.Excel/GeneratedSheets/MYCWarResultNotebook.cs @@ -7,32 +7,28 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "MYCWarResultNotebook", columnHash: 0x446c84d6 )] - public class MYCWarResultNotebook : IExcelRow + public class MYCWarResultNotebook : ExcelRow { - public byte Number; - public byte Unknown540; - public byte Unknown541; - public LazyRow< Quest > Quest; - public int Icon; - public int Image; - public byte Rarity; - public SeString NameJP; - public SeString Name; - public SeString Description; + public byte Number { get; set; } + public byte Unknown540 { get; set; } + public byte Unknown541 { get; set; } + public LazyRow< Quest > Quest { get; set; } + public int Icon { get; set; } + public int Image { get; set; } + public byte Rarity { get; set; } + public SeString NameJP { get; set; } + public SeString Name { get; set; } + public SeString Description { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Number = parser.ReadColumn< byte >( 0 ); Unknown540 = parser.ReadColumn< byte >( 1 ); Unknown541 = parser.ReadColumn< byte >( 2 ); - Quest = new LazyRow< Quest >( lumina, parser.ReadColumn< int >( 3 ), language ); + Quest = new LazyRow< Quest >( gameData, parser.ReadColumn< int >( 3 ), language ); Icon = parser.ReadColumn< int >( 4 ); Image = parser.ReadColumn< int >( 5 ); Rarity = parser.ReadColumn< byte >( 6 ); diff --git a/src/Lumina.Excel/GeneratedSheets/MacroIcon.cs b/src/Lumina.Excel/GeneratedSheets/MacroIcon.cs index f3a77086..f9e6bd88 100644 --- a/src/Lumina.Excel/GeneratedSheets/MacroIcon.cs +++ b/src/Lumina.Excel/GeneratedSheets/MacroIcon.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "MacroIcon", columnHash: 0xda365c51 )] - public class MacroIcon : IExcelRow + public class MacroIcon : ExcelRow { - public int Icon; + public int Icon { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Icon = parser.ReadColumn< int >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/MacroIconRedirectOld.cs b/src/Lumina.Excel/GeneratedSheets/MacroIconRedirectOld.cs index a858eb1d..d2518faf 100644 --- a/src/Lumina.Excel/GeneratedSheets/MacroIconRedirectOld.cs +++ b/src/Lumina.Excel/GeneratedSheets/MacroIconRedirectOld.cs @@ -7,19 +7,15 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "MacroIconRedirectOld", columnHash: 0x5c9aa6b3 )] - public class MacroIconRedirectOld : IExcelRow + public class MacroIconRedirectOld : ExcelRow { - public uint IconOld; - public int IconNew; + public uint IconOld { get; set; } + public int IconNew { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); IconOld = parser.ReadColumn< uint >( 0 ); IconNew = parser.ReadColumn< int >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/MainCommand.cs b/src/Lumina.Excel/GeneratedSheets/MainCommand.cs index dfa79f28..dbbdca94 100644 --- a/src/Lumina.Excel/GeneratedSheets/MainCommand.cs +++ b/src/Lumina.Excel/GeneratedSheets/MainCommand.cs @@ -7,27 +7,23 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "MainCommand", columnHash: 0x63da0c66 )] - public class MainCommand : IExcelRow + public class MainCommand : ExcelRow { - public int Icon; - public byte Category; - public LazyRow< MainCommandCategory > MainCommandCategory; - public sbyte SortID; - public SeString Name; - public SeString Description; + public int Icon { get; set; } + public byte Category { get; set; } + public LazyRow< MainCommandCategory > MainCommandCategory { get; set; } + public sbyte SortID { get; set; } + public SeString Name { get; set; } + public SeString Description { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Icon = parser.ReadColumn< int >( 0 ); Category = parser.ReadColumn< byte >( 1 ); - MainCommandCategory = new LazyRow< MainCommandCategory >( lumina, parser.ReadColumn< byte >( 2 ), language ); + MainCommandCategory = new LazyRow< MainCommandCategory >( gameData, parser.ReadColumn< byte >( 2 ), language ); SortID = parser.ReadColumn< sbyte >( 3 ); Name = parser.ReadColumn< SeString >( 4 ); Description = parser.ReadColumn< SeString >( 5 ); diff --git a/src/Lumina.Excel/GeneratedSheets/MainCommandCategory.cs b/src/Lumina.Excel/GeneratedSheets/MainCommandCategory.cs index f894b4f9..3876bea4 100644 --- a/src/Lumina.Excel/GeneratedSheets/MainCommandCategory.cs +++ b/src/Lumina.Excel/GeneratedSheets/MainCommandCategory.cs @@ -7,19 +7,15 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "MainCommandCategory", columnHash: 0x0c8db36c )] - public class MainCommandCategory : IExcelRow + public class MainCommandCategory : ExcelRow { - public int Unknown0; - public SeString Name; + public int Unknown0 { get; set; } + public SeString Name { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< int >( 0 ); Name = parser.ReadColumn< SeString >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/ManeuversArmor.cs b/src/Lumina.Excel/GeneratedSheets/ManeuversArmor.cs index b937a4cf..c3d92b16 100644 --- a/src/Lumina.Excel/GeneratedSheets/ManeuversArmor.cs +++ b/src/Lumina.Excel/GeneratedSheets/ManeuversArmor.cs @@ -7,29 +7,25 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ManeuversArmor", columnHash: 0xc8b98ed4 )] - public class ManeuversArmor : IExcelRow + public class ManeuversArmor : ExcelRow { - public ushort Unknown0; - public LazyRow< BNpcName >[] BNpcBase; - public byte Unknown3; - public bool Unknown4; - public uint[] Icon; - public SeString Unknown10; - public SeString Unknown11; + public ushort Unknown0 { get; set; } + public LazyRow< BNpcName >[] BNpcBase { get; set; } + public byte Unknown3 { get; set; } + public bool Unknown4 { get; set; } + public uint[] Icon { get; set; } + public SeString Unknown10 { get; set; } + public SeString Unknown11 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< ushort >( 0 ); BNpcBase = new LazyRow< BNpcName >[ 2 ]; for( var i = 0; i < 2; i++ ) - BNpcBase[ i ] = new LazyRow< BNpcName >( lumina, parser.ReadColumn< uint >( 1 + i ), language ); + BNpcBase[ i ] = new LazyRow< BNpcName >( gameData, parser.ReadColumn< uint >( 1 + i ), language ); Unknown3 = parser.ReadColumn< byte >( 3 ); Unknown4 = parser.ReadColumn< bool >( 4 ); Icon = new uint[ 5 ]; diff --git a/src/Lumina.Excel/GeneratedSheets/Map.cs b/src/Lumina.Excel/GeneratedSheets/Map.cs index 46293617..d115ba45 100644 --- a/src/Lumina.Excel/GeneratedSheets/Map.cs +++ b/src/Lumina.Excel/GeneratedSheets/Map.cs @@ -7,35 +7,31 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Map", columnHash: 0x56a0aa07 )] - public class Map : IExcelRow + public class Map : ExcelRow { - public byte MapCondition; - public byte PriorityCategoryUI; - public byte PriorityUI; - public sbyte MapIndex; - public byte Hierarchy; - public ushort MapMarkerRange; - public SeString Id; - public ushort SizeFactor; - public short OffsetX; - public short OffsetY; - public LazyRow< PlaceName > PlaceNameRegion; - public LazyRow< PlaceName > PlaceName; - public LazyRow< PlaceName > PlaceNameSub; - public short DiscoveryIndex; - public uint DiscoveryFlag; - public LazyRow< TerritoryType > TerritoryType; - public bool DiscoveryArrayByte; - public bool IsEvent; + public byte MapCondition { get; set; } + public byte PriorityCategoryUI { get; set; } + public byte PriorityUI { get; set; } + public sbyte MapIndex { get; set; } + public byte Hierarchy { get; set; } + public ushort MapMarkerRange { get; set; } + public SeString Id { get; set; } + public ushort SizeFactor { get; set; } + public short OffsetX { get; set; } + public short OffsetY { get; set; } + public LazyRow< PlaceName > PlaceNameRegion { get; set; } + public LazyRow< PlaceName > PlaceName { get; set; } + public LazyRow< PlaceName > PlaceNameSub { get; set; } + public short DiscoveryIndex { get; set; } + public uint DiscoveryFlag { get; set; } + public LazyRow< TerritoryType > TerritoryType { get; set; } + public bool DiscoveryArrayByte { get; set; } + public bool IsEvent { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); MapCondition = parser.ReadColumn< byte >( 0 ); PriorityCategoryUI = parser.ReadColumn< byte >( 1 ); @@ -47,12 +43,12 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) SizeFactor = parser.ReadColumn< ushort >( 7 ); OffsetX = parser.ReadColumn< short >( 8 ); OffsetY = parser.ReadColumn< short >( 9 ); - PlaceNameRegion = new LazyRow< PlaceName >( lumina, parser.ReadColumn< ushort >( 10 ), language ); - PlaceName = new LazyRow< PlaceName >( lumina, parser.ReadColumn< ushort >( 11 ), language ); - PlaceNameSub = new LazyRow< PlaceName >( lumina, parser.ReadColumn< ushort >( 12 ), language ); + PlaceNameRegion = new LazyRow< PlaceName >( gameData, parser.ReadColumn< ushort >( 10 ), language ); + PlaceName = new LazyRow< PlaceName >( gameData, parser.ReadColumn< ushort >( 11 ), language ); + PlaceNameSub = new LazyRow< PlaceName >( gameData, parser.ReadColumn< ushort >( 12 ), language ); DiscoveryIndex = parser.ReadColumn< short >( 13 ); DiscoveryFlag = parser.ReadColumn< uint >( 14 ); - TerritoryType = new LazyRow< TerritoryType >( lumina, parser.ReadColumn< ushort >( 15 ), language ); + TerritoryType = new LazyRow< TerritoryType >( gameData, parser.ReadColumn< ushort >( 15 ), language ); DiscoveryArrayByte = parser.ReadColumn< bool >( 16 ); IsEvent = parser.ReadColumn< bool >( 17 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/MapMarker.cs b/src/Lumina.Excel/GeneratedSheets/MapMarker.cs index 73dee56c..a278f2b2 100644 --- a/src/Lumina.Excel/GeneratedSheets/MapMarker.cs +++ b/src/Lumina.Excel/GeneratedSheets/MapMarker.cs @@ -7,35 +7,31 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "MapMarker", columnHash: 0x58f22163 )] - public class MapMarker : IExcelRow + public class MapMarker : ExcelRow { - public short X; - public short Y; - public ushort Icon; - public LazyRow< PlaceName > PlaceNameSubtext; - public byte SubtextOrientation; - public LazyRow< MapMarkerRegion > MapMarkerRegion; - public byte Type; - public byte DataType; - public ushort DataKey; - public byte Unknown9; - public byte Unknown10; + public short X { get; set; } + public short Y { get; set; } + public ushort Icon { get; set; } + public LazyRow< PlaceName > PlaceNameSubtext { get; set; } + public byte SubtextOrientation { get; set; } + public LazyRow< MapMarkerRegion > MapMarkerRegion { get; set; } + public byte Type { get; set; } + public byte DataType { get; set; } + public ushort DataKey { get; set; } + public byte Unknown9 { get; set; } + public byte Unknown10 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); X = parser.ReadColumn< short >( 0 ); Y = parser.ReadColumn< short >( 1 ); Icon = parser.ReadColumn< ushort >( 2 ); - PlaceNameSubtext = new LazyRow< PlaceName >( lumina, parser.ReadColumn< ushort >( 3 ), language ); + PlaceNameSubtext = new LazyRow< PlaceName >( gameData, parser.ReadColumn< ushort >( 3 ), language ); SubtextOrientation = parser.ReadColumn< byte >( 4 ); - MapMarkerRegion = new LazyRow< MapMarkerRegion >( lumina, parser.ReadColumn< byte >( 5 ), language ); + MapMarkerRegion = new LazyRow< MapMarkerRegion >( gameData, parser.ReadColumn< byte >( 5 ), language ); Type = parser.ReadColumn< byte >( 6 ); DataType = parser.ReadColumn< byte >( 7 ); DataKey = parser.ReadColumn< ushort >( 8 ); diff --git a/src/Lumina.Excel/GeneratedSheets/MapMarkerRegion.cs b/src/Lumina.Excel/GeneratedSheets/MapMarkerRegion.cs index 69cd591f..b285db56 100644 --- a/src/Lumina.Excel/GeneratedSheets/MapMarkerRegion.cs +++ b/src/Lumina.Excel/GeneratedSheets/MapMarkerRegion.cs @@ -7,29 +7,25 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "MapMarkerRegion", columnHash: 0xe2747195 )] - public class MapMarkerRegion : IExcelRow + public class MapMarkerRegion : ExcelRow { - public byte Unknown0; - public short X; - public short Unknown2; - public ushort Unknown3; - public ushort Unknown4; - public short Unknown5; - public short Unknown6; - public ushort Unknown7; - public ushort Unknown8; - public short Unknown9; - public short Unknown10; - public bool Unknown11; + public byte Unknown0 { get; set; } + public short X { get; set; } + public short Unknown2 { get; set; } + public ushort Unknown3 { get; set; } + public ushort Unknown4 { get; set; } + public short Unknown5 { get; set; } + public short Unknown6 { get; set; } + public ushort Unknown7 { get; set; } + public ushort Unknown8 { get; set; } + public short Unknown9 { get; set; } + public short Unknown10 { get; set; } + public bool Unknown11 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< byte >( 0 ); X = parser.ReadColumn< short >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/MapSymbol.cs b/src/Lumina.Excel/GeneratedSheets/MapSymbol.cs index 92a24ee1..64e47165 100644 --- a/src/Lumina.Excel/GeneratedSheets/MapSymbol.cs +++ b/src/Lumina.Excel/GeneratedSheets/MapSymbol.cs @@ -7,23 +7,19 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "MapSymbol", columnHash: 0xe7e370e4 )] - public class MapSymbol : IExcelRow + public class MapSymbol : ExcelRow { - public int Icon; - public LazyRow< PlaceName > PlaceName; - public bool DisplayNavi; + public int Icon { get; set; } + public LazyRow< PlaceName > PlaceName { get; set; } + public bool DisplayNavi { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Icon = parser.ReadColumn< int >( 0 ); - PlaceName = new LazyRow< PlaceName >( lumina, parser.ReadColumn< int >( 1 ), language ); + PlaceName = new LazyRow< PlaceName >( gameData, parser.ReadColumn< int >( 1 ), language ); DisplayNavi = parser.ReadColumn< bool >( 2 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/Marker.cs b/src/Lumina.Excel/GeneratedSheets/Marker.cs index 956d6c83..93aec7ba 100644 --- a/src/Lumina.Excel/GeneratedSheets/Marker.cs +++ b/src/Lumina.Excel/GeneratedSheets/Marker.cs @@ -7,19 +7,15 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Marker", columnHash: 0x0c8db36c )] - public class Marker : IExcelRow + public class Marker : ExcelRow { - public int Icon; - public SeString Name; + public int Icon { get; set; } + public SeString Name { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Icon = parser.ReadColumn< int >( 0 ); Name = parser.ReadColumn< SeString >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/MasterpieceSupplyDuty.cs b/src/Lumina.Excel/GeneratedSheets/MasterpieceSupplyDuty.cs index 925b7dae..e0dab14e 100644 --- a/src/Lumina.Excel/GeneratedSheets/MasterpieceSupplyDuty.cs +++ b/src/Lumina.Excel/GeneratedSheets/MasterpieceSupplyDuty.cs @@ -7,7 +7,7 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "MasterpieceSupplyDuty", columnHash: 0x9f2c0d7f )] - public class MasterpieceSupplyDuty : IExcelRow + public class MasterpieceSupplyDuty : ExcelRow { public struct UnkStruct3Struct { @@ -24,22 +24,18 @@ public struct UnkStruct3Struct public byte Stars; } - public LazyRow< ClassJob > ClassJob; - public byte ClassJobLevel; - public LazyRow< Currency > RewardCurrency; - public UnkStruct3Struct[] UnkStruct3; + public LazyRow< ClassJob > ClassJob { get; set; } + public byte ClassJobLevel { get; set; } + public ushort RewardCurrency { get; set; } + public UnkStruct3Struct[] UnkStruct3 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - ClassJob = new LazyRow< ClassJob >( lumina, parser.ReadColumn< byte >( 0 ), language ); + ClassJob = new LazyRow< ClassJob >( gameData, parser.ReadColumn< byte >( 0 ), language ); ClassJobLevel = parser.ReadColumn< byte >( 1 ); - RewardCurrency = new LazyRow< Currency >( lumina, parser.ReadColumn< ushort >( 2 ), language ); + RewardCurrency = parser.ReadColumn< ushort >( 2 ); UnkStruct3 = new UnkStruct3Struct[ 8 ]; for( var i = 0; i < 8; i++ ) { diff --git a/src/Lumina.Excel/GeneratedSheets/MasterpieceSupplyMultiplier.cs b/src/Lumina.Excel/GeneratedSheets/MasterpieceSupplyMultiplier.cs index 03348365..9a45c935 100644 --- a/src/Lumina.Excel/GeneratedSheets/MasterpieceSupplyMultiplier.cs +++ b/src/Lumina.Excel/GeneratedSheets/MasterpieceSupplyMultiplier.cs @@ -7,27 +7,23 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "MasterpieceSupplyMultiplier", columnHash: 0x1b64fcf8 )] - public class MasterpieceSupplyMultiplier : IExcelRow + public class MasterpieceSupplyMultiplier : ExcelRow { - public ushort[] XpMultiplier; - public ushort Unknown2; - public ushort Unknown3; - public ushort[] CurrencyMultiplier; - public ushort Unknown6; - public ushort Unknown7; - public ushort Unknown8; - public ushort Unknown9; - public ushort Unknown10; - public ushort Unknown11; + public ushort[] XpMultiplier { get; set; } + public ushort Unknown2 { get; set; } + public ushort Unknown3 { get; set; } + public ushort[] CurrencyMultiplier { get; set; } + public ushort Unknown6 { get; set; } + public ushort Unknown7 { get; set; } + public ushort Unknown8 { get; set; } + public ushort Unknown9 { get; set; } + public ushort Unknown10 { get; set; } + public ushort Unknown11 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); XpMultiplier = new ushort[ 2 ]; for( var i = 0; i < 2; i++ ) diff --git a/src/Lumina.Excel/GeneratedSheets/Materia.cs b/src/Lumina.Excel/GeneratedSheets/Materia.cs index a92c2e32..6f080800 100644 --- a/src/Lumina.Excel/GeneratedSheets/Materia.cs +++ b/src/Lumina.Excel/GeneratedSheets/Materia.cs @@ -7,25 +7,21 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Materia", columnHash: 0xa10c6ac0 )] - public class Materia : IExcelRow + public class Materia : ExcelRow { - public LazyRow< Item >[] Item; - public LazyRow< BaseParam > BaseParam; - public short[] Value; + public LazyRow< Item >[] Item { get; set; } + public LazyRow< BaseParam > BaseParam { get; set; } + public short[] Value { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Item = new LazyRow< Item >[ 10 ]; for( var i = 0; i < 10; i++ ) - Item[ i ] = new LazyRow< Item >( lumina, parser.ReadColumn< int >( 0 + i ), language ); - BaseParam = new LazyRow< BaseParam >( lumina, parser.ReadColumn< byte >( 10 ), language ); + Item[ i ] = new LazyRow< Item >( gameData, parser.ReadColumn< int >( 0 + i ), language ); + BaseParam = new LazyRow< BaseParam >( gameData, parser.ReadColumn< byte >( 10 ), language ); Value = new short[ 10 ]; for( var i = 0; i < 10; i++ ) Value[ i ] = parser.ReadColumn< short >( 11 + i ); diff --git a/src/Lumina.Excel/GeneratedSheets/MateriaJoinRate.cs b/src/Lumina.Excel/GeneratedSheets/MateriaJoinRate.cs index f82af0b3..1d59ff92 100644 --- a/src/Lumina.Excel/GeneratedSheets/MateriaJoinRate.cs +++ b/src/Lumina.Excel/GeneratedSheets/MateriaJoinRate.cs @@ -7,19 +7,15 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "MateriaJoinRate", columnHash: 0xab31b42e )] - public class MateriaJoinRate : IExcelRow + public class MateriaJoinRate : ExcelRow { - public float[] NQOvermeldPctSlot; - public float[] HQOvermeldPctSlot; + public float[] NQOvermeldPctSlot { get; set; } + public float[] HQOvermeldPctSlot { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); NQOvermeldPctSlot = new float[ 4 ]; for( var i = 0; i < 4; i++ ) diff --git a/src/Lumina.Excel/GeneratedSheets/MateriaJoinRateGatherCraft.cs b/src/Lumina.Excel/GeneratedSheets/MateriaJoinRateGatherCraft.cs index 6b20042f..33e75e4e 100644 --- a/src/Lumina.Excel/GeneratedSheets/MateriaJoinRateGatherCraft.cs +++ b/src/Lumina.Excel/GeneratedSheets/MateriaJoinRateGatherCraft.cs @@ -7,19 +7,15 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "MateriaJoinRateGatherCraft", columnHash: 0xab31b42e )] - public class MateriaJoinRateGatherCraft : IExcelRow + public class MateriaJoinRateGatherCraft : ExcelRow { - public float[] NQOvermeldPctSlot; - public float[] HQOvermeldPctSlot; + public float[] NQOvermeldPctSlot { get; set; } + public float[] HQOvermeldPctSlot { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); NQOvermeldPctSlot = new float[ 4 ]; for( var i = 0; i < 4; i++ ) diff --git a/src/Lumina.Excel/GeneratedSheets/MateriaTomestoneRate.cs b/src/Lumina.Excel/GeneratedSheets/MateriaTomestoneRate.cs index 5dfe390d..416f976c 100644 --- a/src/Lumina.Excel/GeneratedSheets/MateriaTomestoneRate.cs +++ b/src/Lumina.Excel/GeneratedSheets/MateriaTomestoneRate.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "MateriaTomestoneRate", columnHash: 0xdbf43666 )] - public class MateriaTomestoneRate : IExcelRow + public class MateriaTomestoneRate : ExcelRow { - public uint Rate; + public uint Rate { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Rate = parser.ReadColumn< uint >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/MiniGameRA.cs b/src/Lumina.Excel/GeneratedSheets/MiniGameRA.cs index ddd12578..fb5e61ba 100644 --- a/src/Lumina.Excel/GeneratedSheets/MiniGameRA.cs +++ b/src/Lumina.Excel/GeneratedSheets/MiniGameRA.cs @@ -7,43 +7,39 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "MiniGameRA", columnHash: 0xf22d339e )] - public class MiniGameRA : IExcelRow + public class MiniGameRA : ExcelRow { - public int Unknown0; - public int Icon; - public int Image; - public LazyRow< BGM > BGM; - public int Unknown4; - public bool Unknown5; - public uint Unknown6; - public bool Unknown7; - public bool Unknown8; - public bool Unknown9; - public ushort Unknown10; - public ushort Unknown11; - public ushort Unknown12; - public short Unknown13; - public short Unknown14; - public short Unknown15; - public short Unknown16; - public byte Unknown17; - public byte Unknown18; - public byte Unknown19; - public byte Unknown20; + public int Unknown0 { get; set; } + public int Icon { get; set; } + public int Image { get; set; } + public LazyRow< BGM > BGM { get; set; } + public int Unknown4 { get; set; } + public bool Unknown5 { get; set; } + public uint Unknown6 { get; set; } + public bool Unknown7 { get; set; } + public bool Unknown8 { get; set; } + public bool Unknown9 { get; set; } + public ushort Unknown10 { get; set; } + public ushort Unknown11 { get; set; } + public ushort Unknown12 { get; set; } + public short Unknown13 { get; set; } + public short Unknown14 { get; set; } + public short Unknown15 { get; set; } + public short Unknown16 { get; set; } + public byte Unknown17 { get; set; } + public byte Unknown18 { get; set; } + public byte Unknown19 { get; set; } + public byte Unknown20 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< int >( 0 ); Icon = parser.ReadColumn< int >( 1 ); Image = parser.ReadColumn< int >( 2 ); - BGM = new LazyRow< BGM >( lumina, parser.ReadColumn< int >( 3 ), language ); + BGM = new LazyRow< BGM >( gameData, parser.ReadColumn< int >( 3 ), language ); Unknown4 = parser.ReadColumn< int >( 4 ); Unknown5 = parser.ReadColumn< bool >( 5 ); Unknown6 = parser.ReadColumn< uint >( 6 ); diff --git a/src/Lumina.Excel/GeneratedSheets/MinionRace.cs b/src/Lumina.Excel/GeneratedSheets/MinionRace.cs index 4c655379..7c7e9b97 100644 --- a/src/Lumina.Excel/GeneratedSheets/MinionRace.cs +++ b/src/Lumina.Excel/GeneratedSheets/MinionRace.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "MinionRace", columnHash: 0xdebb20e3 )] - public class MinionRace : IExcelRow + public class MinionRace : ExcelRow { - public SeString Name; + public SeString Name { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/MinionRules.cs b/src/Lumina.Excel/GeneratedSheets/MinionRules.cs index d95068f9..bb338834 100644 --- a/src/Lumina.Excel/GeneratedSheets/MinionRules.cs +++ b/src/Lumina.Excel/GeneratedSheets/MinionRules.cs @@ -7,19 +7,15 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "MinionRules", columnHash: 0x9db0e48f )] - public class MinionRules : IExcelRow + public class MinionRules : ExcelRow { - public SeString Rule; - public SeString Description; + public SeString Rule { get; set; } + public SeString Description { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Rule = parser.ReadColumn< SeString >( 0 ); Description = parser.ReadColumn< SeString >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/MinionSkillType.cs b/src/Lumina.Excel/GeneratedSheets/MinionSkillType.cs index eab71011..ac83e2c7 100644 --- a/src/Lumina.Excel/GeneratedSheets/MinionSkillType.cs +++ b/src/Lumina.Excel/GeneratedSheets/MinionSkillType.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "MinionSkillType", columnHash: 0xdebb20e3 )] - public class MinionSkillType : IExcelRow + public class MinionSkillType : ExcelRow { - public SeString Name; + public SeString Name { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/MobHuntOrder.cs b/src/Lumina.Excel/GeneratedSheets/MobHuntOrder.cs index 2d5fadc2..a547a9fc 100644 --- a/src/Lumina.Excel/GeneratedSheets/MobHuntOrder.cs +++ b/src/Lumina.Excel/GeneratedSheets/MobHuntOrder.cs @@ -7,28 +7,24 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "MobHuntOrder", columnHash: 0xa9aa9ab5 )] - public class MobHuntOrder : IExcelRow + public class MobHuntOrder : ExcelRow { - public LazyRow< MobHuntTarget > Target; - public byte NeededKills; - public byte Type; - public byte Rank; - public LazyRow< MobHuntReward > MobHuntReward; + public LazyRow< MobHuntTarget > Target { get; set; } + public byte NeededKills { get; set; } + public byte Type { get; set; } + public byte Rank { get; set; } + public LazyRow< MobHuntReward > MobHuntReward { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Target = new LazyRow< MobHuntTarget >( lumina, parser.ReadColumn< ushort >( 0 ), language ); + Target = new LazyRow< MobHuntTarget >( gameData, parser.ReadColumn< ushort >( 0 ), language ); NeededKills = parser.ReadColumn< byte >( 1 ); Type = parser.ReadColumn< byte >( 2 ); Rank = parser.ReadColumn< byte >( 3 ); - MobHuntReward = new LazyRow< MobHuntReward >( lumina, parser.ReadColumn< byte >( 4 ), language ); + MobHuntReward = new LazyRow< MobHuntReward >( gameData, parser.ReadColumn< byte >( 4 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/MobHuntOrderType.cs b/src/Lumina.Excel/GeneratedSheets/MobHuntOrderType.cs index f7dda301..6e1d4c06 100644 --- a/src/Lumina.Excel/GeneratedSheets/MobHuntOrderType.cs +++ b/src/Lumina.Excel/GeneratedSheets/MobHuntOrderType.cs @@ -7,27 +7,23 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "MobHuntOrderType", columnHash: 0x795a75a0 )] - public class MobHuntOrderType : IExcelRow + public class MobHuntOrderType : ExcelRow { - public byte Type; - public LazyRow< Quest > Quest; - public LazyRow< EventItem > EventItem; - public LazyRow< MobHuntOrder > OrderStart; - public byte OrderAmount; + public byte Type { get; set; } + public LazyRow< Quest > Quest { get; set; } + public LazyRow< EventItem > EventItem { get; set; } + public LazyRow< MobHuntOrder > OrderStart { get; set; } + public byte OrderAmount { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Type = parser.ReadColumn< byte >( 0 ); - Quest = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 1 ), language ); - EventItem = new LazyRow< EventItem >( lumina, parser.ReadColumn< uint >( 2 ), language ); - OrderStart = new LazyRow< MobHuntOrder >( lumina, parser.ReadColumn< ushort >( 3 ), language ); + Quest = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 1 ), language ); + EventItem = new LazyRow< EventItem >( gameData, parser.ReadColumn< uint >( 2 ), language ); + OrderStart = new LazyRow< MobHuntOrder >( gameData, parser.ReadColumn< ushort >( 3 ), language ); OrderAmount = parser.ReadColumn< byte >( 4 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/MobHuntReward.cs b/src/Lumina.Excel/GeneratedSheets/MobHuntReward.cs index 70344d67..057ad3df 100644 --- a/src/Lumina.Excel/GeneratedSheets/MobHuntReward.cs +++ b/src/Lumina.Excel/GeneratedSheets/MobHuntReward.cs @@ -7,25 +7,21 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "MobHuntReward", columnHash: 0x4ace707c )] - public class MobHuntReward : IExcelRow + public class MobHuntReward : ExcelRow { - public uint ExpReward; - public ushort GilReward; - public LazyRow< ExVersion > Expansion; - public ushort CurrencyReward; + public uint ExpReward { get; set; } + public ushort GilReward { get; set; } + public LazyRow< ExVersion > Expansion { get; set; } + public ushort CurrencyReward { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); ExpReward = parser.ReadColumn< uint >( 0 ); GilReward = parser.ReadColumn< ushort >( 1 ); - Expansion = new LazyRow< ExVersion >( lumina, parser.ReadColumn< byte >( 2 ), language ); + Expansion = new LazyRow< ExVersion >( gameData, parser.ReadColumn< byte >( 2 ), language ); CurrencyReward = parser.ReadColumn< ushort >( 3 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/MobHuntRewardCap.cs b/src/Lumina.Excel/GeneratedSheets/MobHuntRewardCap.cs index c768921a..1ff07715 100644 --- a/src/Lumina.Excel/GeneratedSheets/MobHuntRewardCap.cs +++ b/src/Lumina.Excel/GeneratedSheets/MobHuntRewardCap.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "MobHuntRewardCap", columnHash: 0xdbf43666 )] - public class MobHuntRewardCap : IExcelRow + public class MobHuntRewardCap : ExcelRow { - public uint ExpCap; + public uint ExpCap { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); ExpCap = parser.ReadColumn< uint >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/MobHuntTarget.cs b/src/Lumina.Excel/GeneratedSheets/MobHuntTarget.cs index 0b175e4b..ab0b81b0 100644 --- a/src/Lumina.Excel/GeneratedSheets/MobHuntTarget.cs +++ b/src/Lumina.Excel/GeneratedSheets/MobHuntTarget.cs @@ -7,28 +7,24 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "MobHuntTarget", columnHash: 0x83a7f541 )] - public class MobHuntTarget : IExcelRow + public class MobHuntTarget : ExcelRow { - public LazyRow< BNpcName > Name; - public LazyRow< Fate > FATE; - public uint Icon; - public LazyRow< Map > TerritoryType; - public LazyRow< PlaceName > PlaceName; + public LazyRow< BNpcName > Name { get; set; } + public LazyRow< Fate > FATE { get; set; } + public uint Icon { get; set; } + public LazyRow< Map > TerritoryType { get; set; } + public LazyRow< PlaceName > PlaceName { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Name = new LazyRow< BNpcName >( lumina, parser.ReadColumn< ushort >( 0 ), language ); - FATE = new LazyRow< Fate >( lumina, parser.ReadColumn< ushort >( 1 ), language ); + Name = new LazyRow< BNpcName >( gameData, parser.ReadColumn< ushort >( 0 ), language ); + FATE = new LazyRow< Fate >( gameData, parser.ReadColumn< ushort >( 1 ), language ); Icon = parser.ReadColumn< uint >( 2 ); - TerritoryType = new LazyRow< Map >( lumina, parser.ReadColumn< ushort >( 3 ), language ); - PlaceName = new LazyRow< PlaceName >( lumina, parser.ReadColumn< ushort >( 4 ), language ); + TerritoryType = new LazyRow< Map >( gameData, parser.ReadColumn< ushort >( 3 ), language ); + PlaceName = new LazyRow< PlaceName >( gameData, parser.ReadColumn< ushort >( 4 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/ModelChara.cs b/src/Lumina.Excel/GeneratedSheets/ModelChara.cs index 26844d7c..b1c870bb 100644 --- a/src/Lumina.Excel/GeneratedSheets/ModelChara.cs +++ b/src/Lumina.Excel/GeneratedSheets/ModelChara.cs @@ -7,34 +7,30 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ModelChara", columnHash: 0xc7ed51f9 )] - public class ModelChara : IExcelRow + public class ModelChara : ExcelRow { - public byte Type; - public ushort Model; - public byte Base; - public byte Variant; - public ushort SEPack; - public byte Unknown5; - public bool Unknown6; - public bool PapVariation; - public byte Unknown8; - public sbyte Unknown9; - public bool Unknown10; - public bool Unknown11; - public bool Unknown12; - public bool Unknown13; - public bool Unknown14; - public byte Unknown15; - public bool Unknown16; + public byte Type { get; set; } + public ushort Model { get; set; } + public byte Base { get; set; } + public byte Variant { get; set; } + public ushort SEPack { get; set; } + public byte Unknown5 { get; set; } + public bool Unknown6 { get; set; } + public bool PapVariation { get; set; } + public byte Unknown8 { get; set; } + public sbyte Unknown9 { get; set; } + public bool Unknown10 { get; set; } + public bool Unknown11 { get; set; } + public bool Unknown12 { get; set; } + public bool Unknown13 { get; set; } + public bool Unknown14 { get; set; } + public byte Unknown15 { get; set; } + public bool Unknown16 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Type = parser.ReadColumn< byte >( 0 ); Model = parser.ReadColumn< ushort >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/ModelSkeleton.cs b/src/Lumina.Excel/GeneratedSheets/ModelSkeleton.cs index 60000899..437c7b41 100644 --- a/src/Lumina.Excel/GeneratedSheets/ModelSkeleton.cs +++ b/src/Lumina.Excel/GeneratedSheets/ModelSkeleton.cs @@ -7,34 +7,30 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ModelSkeleton", columnHash: 0x94cc54f1 )] - public class ModelSkeleton : IExcelRow + public class ModelSkeleton : ExcelRow { - public float Radius; - public float Height; - public float VFXScale; - public ushort Unknown3; - public ushort Unknown4; - public ushort Unknown5; - public ushort Unknown6; - public ushort Unknown7; - public ushort Unknown8; - public ushort Unknown9; - public ushort Unknown10; - public float FloatHeight; - public float FloatDown; - public ushort FloatUp; - public byte Unknown14; - public bool MotionBlendType; - public byte LoopFlySE; + public float Radius { get; set; } + public float Height { get; set; } + public float VFXScale { get; set; } + public ushort Unknown3 { get; set; } + public ushort Unknown4 { get; set; } + public ushort Unknown5 { get; set; } + public ushort Unknown6 { get; set; } + public ushort Unknown7 { get; set; } + public ushort Unknown8 { get; set; } + public ushort Unknown9 { get; set; } + public ushort Unknown10 { get; set; } + public float FloatHeight { get; set; } + public float FloatDown { get; set; } + public ushort FloatUp { get; set; } + public byte Unknown14 { get; set; } + public bool MotionBlendType { get; set; } + public byte LoopFlySE { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Radius = parser.ReadColumn< float >( 0 ); Height = parser.ReadColumn< float >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/ModelState.cs b/src/Lumina.Excel/GeneratedSheets/ModelState.cs index 546ce7de..cc89e989 100644 --- a/src/Lumina.Excel/GeneratedSheets/ModelState.cs +++ b/src/Lumina.Excel/GeneratedSheets/ModelState.cs @@ -7,22 +7,18 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ModelState", columnHash: 0xd73eab80 )] - public class ModelState : IExcelRow + public class ModelState : ExcelRow { - public byte Unknown0; - public LazyRow< ActionTimeline > Start; + public byte Unknown0 { get; set; } + public LazyRow< ActionTimeline > Start { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< byte >( 0 ); - Start = new LazyRow< ActionTimeline >( lumina, parser.ReadColumn< ushort >( 1 ), language ); + Start = new LazyRow< ActionTimeline >( gameData, parser.ReadColumn< ushort >( 1 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/MonsterNote.cs b/src/Lumina.Excel/GeneratedSheets/MonsterNote.cs index 40480d20..b660b31b 100644 --- a/src/Lumina.Excel/GeneratedSheets/MonsterNote.cs +++ b/src/Lumina.Excel/GeneratedSheets/MonsterNote.cs @@ -7,25 +7,21 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "MonsterNote", columnHash: 0x50b4cd8f )] - public class MonsterNote : IExcelRow + public class MonsterNote : ExcelRow { - public LazyRow< MonsterNoteTarget >[] MonsterNoteTarget; - public byte[] Count; - public uint Reward; - public SeString Name; + public LazyRow< MonsterNoteTarget >[] MonsterNoteTarget { get; set; } + public byte[] Count { get; set; } + public uint Reward { get; set; } + public SeString Name { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); MonsterNoteTarget = new LazyRow< MonsterNoteTarget >[ 4 ]; for( var i = 0; i < 4; i++ ) - MonsterNoteTarget[ i ] = new LazyRow< MonsterNoteTarget >( lumina, parser.ReadColumn< ushort >( 0 + i ), language ); + MonsterNoteTarget[ i ] = new LazyRow< MonsterNoteTarget >( gameData, parser.ReadColumn< ushort >( 0 + i ), language ); Count = new byte[ 4 ]; for( var i = 0; i < 4; i++ ) Count[ i ] = parser.ReadColumn< byte >( 4 + i ); diff --git a/src/Lumina.Excel/GeneratedSheets/MonsterNoteTarget.cs b/src/Lumina.Excel/GeneratedSheets/MonsterNoteTarget.cs index aac9cad8..8b824f8a 100644 --- a/src/Lumina.Excel/GeneratedSheets/MonsterNoteTarget.cs +++ b/src/Lumina.Excel/GeneratedSheets/MonsterNoteTarget.cs @@ -7,7 +7,7 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "MonsterNoteTarget", columnHash: 0x4157404f )] - public class MonsterNoteTarget : IExcelRow + public class MonsterNoteTarget : ExcelRow { public struct UnkStruct3Struct { @@ -15,22 +15,18 @@ public struct UnkStruct3Struct public ushort PlaceNameLocation; } - public LazyRow< BNpcName > BNpcName; - public int Icon; - public LazyRow< Town > Town; - public UnkStruct3Struct[] UnkStruct3; + public LazyRow< BNpcName > BNpcName { get; set; } + public int Icon { get; set; } + public LazyRow< Town > Town { get; set; } + public UnkStruct3Struct[] UnkStruct3 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - BNpcName = new LazyRow< BNpcName >( lumina, parser.ReadColumn< ushort >( 0 ), language ); + BNpcName = new LazyRow< BNpcName >( gameData, parser.ReadColumn< ushort >( 0 ), language ); Icon = parser.ReadColumn< int >( 1 ); - Town = new LazyRow< Town >( lumina, parser.ReadColumn< byte >( 2 ), language ); + Town = new LazyRow< Town >( gameData, parser.ReadColumn< byte >( 2 ), language ); UnkStruct3 = new UnkStruct3Struct[ 3 ]; for( var i = 0; i < 3; i++ ) { diff --git a/src/Lumina.Excel/GeneratedSheets/MotionTimeline.cs b/src/Lumina.Excel/GeneratedSheets/MotionTimeline.cs index 5b89c1aa..ec03ff16 100644 --- a/src/Lumina.Excel/GeneratedSheets/MotionTimeline.cs +++ b/src/Lumina.Excel/GeneratedSheets/MotionTimeline.cs @@ -7,22 +7,18 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "MotionTimeline", columnHash: 0xd5952f72 )] - public class MotionTimeline : IExcelRow + public class MotionTimeline : ExcelRow { - public SeString Filename; - public byte BlendGroup; - public bool IsLoop; - public bool IsBlinkEnable; - public bool IsLipEnable; + public SeString Filename { get; set; } + public byte BlendGroup { get; set; } + public bool IsLoop { get; set; } + public bool IsBlinkEnable { get; set; } + public bool IsLipEnable { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Filename = parser.ReadColumn< SeString >( 0 ); BlendGroup = parser.ReadColumn< byte >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/MotionTimelineBlendTable.cs b/src/Lumina.Excel/GeneratedSheets/MotionTimelineBlendTable.cs index 0f96d4a9..b2d08858 100644 --- a/src/Lumina.Excel/GeneratedSheets/MotionTimelineBlendTable.cs +++ b/src/Lumina.Excel/GeneratedSheets/MotionTimelineBlendTable.cs @@ -7,23 +7,19 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "MotionTimelineBlendTable", columnHash: 0x69213275 )] - public class MotionTimelineBlendTable : IExcelRow + public class MotionTimelineBlendTable : ExcelRow { - public byte DestBlendGroup; - public byte SrcBlendGroup; - public byte BlendFrame_PC; - public byte BlendFram_TypeA; - public byte BlendFram_TypeB; - public byte BlendFram_TypeC; + public byte DestBlendGroup { get; set; } + public byte SrcBlendGroup { get; set; } + public byte BlendFrame_PC { get; set; } + public byte BlendFram_TypeA { get; set; } + public byte BlendFram_TypeB { get; set; } + public byte BlendFram_TypeC { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); DestBlendGroup = parser.ReadColumn< byte >( 0 ); SrcBlendGroup = parser.ReadColumn< byte >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/Mount.cs b/src/Lumina.Excel/GeneratedSheets/Mount.cs index e6764662..21cfc171 100644 --- a/src/Lumina.Excel/GeneratedSheets/Mount.cs +++ b/src/Lumina.Excel/GeneratedSheets/Mount.cs @@ -7,62 +7,58 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Mount", columnHash: 0xd4a8261b )] - public class Mount : IExcelRow + public class Mount : ExcelRow { - public SeString Singular; - public sbyte Adjective; - public SeString Plural; - public sbyte PossessivePronoun; - public sbyte StartsWithVowel; - public sbyte Unknown5; - public sbyte Pronoun; - public sbyte Article; - public LazyRow< ModelChara > ModelChara; - public ushort Unknown9; - public LazyRow< MountFlyingCondition > FlyingCondition; - public byte Unknown11; - public byte Unknown12; - public byte Unknown13; - public byte IsFlying; - public byte Unknown15; - public LazyRow< MountCustomize > MountCustomize; - public LazyRow< BGM > RideBGM; - public SeString Unknown18; - public SeString Unknown19; - public SeString Unknown20; - public byte ExitMoveDist; - public byte ExitMoveSpeed; - public bool Unknown23; - public bool IsEmote; - public int EquipHead; - public int EquipBody; - public int EquipLeg; - public int EquipFoot; - public short Order; - public ushort Icon; - public byte UIPriority; - public byte RadiusRate; - public byte BaseMotionSpeed_Run; - public byte BaseMotionSpeed_Walk; - public byte Unknown35; - public byte ExtraSeats; - public LazyRow< MountAction > MountAction; - public bool IsAirborne; - public bool ExHotbarEnableConfig; - public bool UseEP; - public bool Unknown41; - public bool IsImmobile; - public byte Unknown43; - public byte Unknown44; + public SeString Singular { get; set; } + public sbyte Adjective { get; set; } + public SeString Plural { get; set; } + public sbyte PossessivePronoun { get; set; } + public sbyte StartsWithVowel { get; set; } + public sbyte Unknown5 { get; set; } + public sbyte Pronoun { get; set; } + public sbyte Article { get; set; } + public LazyRow< ModelChara > ModelChara { get; set; } + public ushort Unknown9 { get; set; } + public LazyRow< MountFlyingCondition > FlyingCondition { get; set; } + public byte Unknown11 { get; set; } + public byte Unknown12 { get; set; } + public byte Unknown13 { get; set; } + public byte IsFlying { get; set; } + public byte Unknown15 { get; set; } + public LazyRow< MountCustomize > MountCustomize { get; set; } + public LazyRow< BGM > RideBGM { get; set; } + public SeString Unknown18 { get; set; } + public SeString Unknown19 { get; set; } + public SeString Unknown20 { get; set; } + public byte ExitMoveDist { get; set; } + public byte ExitMoveSpeed { get; set; } + public bool Unknown23 { get; set; } + public bool IsEmote { get; set; } + public int EquipHead { get; set; } + public int EquipBody { get; set; } + public int EquipLeg { get; set; } + public int EquipFoot { get; set; } + public short Order { get; set; } + public ushort Icon { get; set; } + public byte UIPriority { get; set; } + public byte RadiusRate { get; set; } + public byte BaseMotionSpeed_Run { get; set; } + public byte BaseMotionSpeed_Walk { get; set; } + public byte Unknown35 { get; set; } + public byte ExtraSeats { get; set; } + public LazyRow< MountAction > MountAction { get; set; } + public bool IsAirborne { get; set; } + public bool ExHotbarEnableConfig { get; set; } + public bool UseEP { get; set; } + public bool Unknown41 { get; set; } + public bool IsImmobile { get; set; } + public byte Unknown43 { get; set; } + public byte Unknown44 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Singular = parser.ReadColumn< SeString >( 0 ); Adjective = parser.ReadColumn< sbyte >( 1 ); @@ -72,16 +68,16 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) Unknown5 = parser.ReadColumn< sbyte >( 5 ); Pronoun = parser.ReadColumn< sbyte >( 6 ); Article = parser.ReadColumn< sbyte >( 7 ); - ModelChara = new LazyRow< ModelChara >( lumina, parser.ReadColumn< int >( 8 ), language ); + ModelChara = new LazyRow< ModelChara >( gameData, parser.ReadColumn< int >( 8 ), language ); Unknown9 = parser.ReadColumn< ushort >( 9 ); - FlyingCondition = new LazyRow< MountFlyingCondition >( lumina, parser.ReadColumn< byte >( 10 ), language ); + FlyingCondition = new LazyRow< MountFlyingCondition >( gameData, parser.ReadColumn< byte >( 10 ), language ); Unknown11 = parser.ReadColumn< byte >( 11 ); Unknown12 = parser.ReadColumn< byte >( 12 ); Unknown13 = parser.ReadColumn< byte >( 13 ); IsFlying = parser.ReadColumn< byte >( 14 ); Unknown15 = parser.ReadColumn< byte >( 15 ); - MountCustomize = new LazyRow< MountCustomize >( lumina, parser.ReadColumn< byte >( 16 ), language ); - RideBGM = new LazyRow< BGM >( lumina, parser.ReadColumn< ushort >( 17 ), language ); + MountCustomize = new LazyRow< MountCustomize >( gameData, parser.ReadColumn< byte >( 16 ), language ); + RideBGM = new LazyRow< BGM >( gameData, parser.ReadColumn< ushort >( 17 ), language ); Unknown18 = parser.ReadColumn< SeString >( 18 ); Unknown19 = parser.ReadColumn< SeString >( 19 ); Unknown20 = parser.ReadColumn< SeString >( 20 ); @@ -101,7 +97,7 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) BaseMotionSpeed_Walk = parser.ReadColumn< byte >( 34 ); Unknown35 = parser.ReadColumn< byte >( 35 ); ExtraSeats = parser.ReadColumn< byte >( 36 ); - MountAction = new LazyRow< MountAction >( lumina, parser.ReadColumn< ushort >( 37 ), language ); + MountAction = new LazyRow< MountAction >( gameData, parser.ReadColumn< ushort >( 37 ), language ); IsAirborne = parser.ReadColumn< bool >( 38 ); ExHotbarEnableConfig = parser.ReadColumn< bool >( 39 ); UseEP = parser.ReadColumn< bool >( 40 ); diff --git a/src/Lumina.Excel/GeneratedSheets/MountAction.cs b/src/Lumina.Excel/GeneratedSheets/MountAction.cs index f5fd7830..4de52065 100644 --- a/src/Lumina.Excel/GeneratedSheets/MountAction.cs +++ b/src/Lumina.Excel/GeneratedSheets/MountAction.cs @@ -7,22 +7,18 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "MountAction", columnHash: 0x58822da3 )] - public class MountAction : IExcelRow + public class MountAction : ExcelRow { - public LazyRow< Action >[] Action; + public LazyRow< Action >[] Action { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Action = new LazyRow< Action >[ 6 ]; for( var i = 0; i < 6; i++ ) - Action[ i ] = new LazyRow< Action >( lumina, parser.ReadColumn< ushort >( 0 + i ), language ); + Action[ i ] = new LazyRow< Action >( gameData, parser.ReadColumn< ushort >( 0 + i ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/MountCustomize.cs b/src/Lumina.Excel/GeneratedSheets/MountCustomize.cs index 5af7bfa9..25741d1a 100644 --- a/src/Lumina.Excel/GeneratedSheets/MountCustomize.cs +++ b/src/Lumina.Excel/GeneratedSheets/MountCustomize.cs @@ -7,50 +7,46 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "MountCustomize", columnHash: 0x82bd7e3f )] - public class MountCustomize : IExcelRow + public class MountCustomize : ExcelRow { - public bool Unknown0; - public ushort HyurMaleScale; - public ushort HyurFemaleScale; - public ushort ElezenMaleScale; - public ushort ElezenFemaleScale; - public ushort LalaMaleScale; - public ushort LalaFemaleScale; - public ushort MiqoMaleScale; - public ushort MiqoFemaleScale; - public ushort RoeMaleScale; - public ushort RoeFemaleScale; - public ushort AuRaMaleScale; - public ushort AuRaFemaleScale; - public ushort HrothgarMaleScale; - public ushort HrothgarFemaleScale; - public ushort VieraMaleScale; - public ushort VieraFemaleScale; - public byte HyurMaleCameraHeight; - public byte HyurFemaleCameraHeight; - public byte ElezenMaleCameraHeight; - public byte ElezenFemaleCameraHeight; - public byte LalaMaleCameraHeight; - public byte LalaFemaleCameraHeight; - public byte MiqoMaleCameraHeight; - public byte MiqoFemaleCameraHeight; - public byte RoeMaleCameraHeight; - public byte RoeFemaleCameraHeight; - public byte AuRaMaleCameraHeight; - public byte AuRaFemaleCameraHeight; - public byte HrothgarMaleCameraHeight; - public byte HrothgarRoeFemaleCameraHeight; - public byte VieraMaleCameraHeight; - public byte VieraFemaleCameraHeight; + public bool Unknown0 { get; set; } + public ushort HyurMaleScale { get; set; } + public ushort HyurFemaleScale { get; set; } + public ushort ElezenMaleScale { get; set; } + public ushort ElezenFemaleScale { get; set; } + public ushort LalaMaleScale { get; set; } + public ushort LalaFemaleScale { get; set; } + public ushort MiqoMaleScale { get; set; } + public ushort MiqoFemaleScale { get; set; } + public ushort RoeMaleScale { get; set; } + public ushort RoeFemaleScale { get; set; } + public ushort AuRaMaleScale { get; set; } + public ushort AuRaFemaleScale { get; set; } + public ushort HrothgarMaleScale { get; set; } + public ushort HrothgarFemaleScale { get; set; } + public ushort VieraMaleScale { get; set; } + public ushort VieraFemaleScale { get; set; } + public byte HyurMaleCameraHeight { get; set; } + public byte HyurFemaleCameraHeight { get; set; } + public byte ElezenMaleCameraHeight { get; set; } + public byte ElezenFemaleCameraHeight { get; set; } + public byte LalaMaleCameraHeight { get; set; } + public byte LalaFemaleCameraHeight { get; set; } + public byte MiqoMaleCameraHeight { get; set; } + public byte MiqoFemaleCameraHeight { get; set; } + public byte RoeMaleCameraHeight { get; set; } + public byte RoeFemaleCameraHeight { get; set; } + public byte AuRaMaleCameraHeight { get; set; } + public byte AuRaFemaleCameraHeight { get; set; } + public byte HrothgarMaleCameraHeight { get; set; } + public byte HrothgarRoeFemaleCameraHeight { get; set; } + public byte VieraMaleCameraHeight { get; set; } + public byte VieraFemaleCameraHeight { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< bool >( 0 ); HyurMaleScale = parser.ReadColumn< ushort >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/MountFlyingCondition.cs b/src/Lumina.Excel/GeneratedSheets/MountFlyingCondition.cs index eba4adaa..4807f330 100644 --- a/src/Lumina.Excel/GeneratedSheets/MountFlyingCondition.cs +++ b/src/Lumina.Excel/GeneratedSheets/MountFlyingCondition.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "MountFlyingCondition", columnHash: 0xdbf43666 )] - public class MountFlyingCondition : IExcelRow + public class MountFlyingCondition : ExcelRow { - public LazyRow< Quest > Quest; + public LazyRow< Quest > Quest { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Quest = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 0 ), language ); + Quest = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 0 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/MountSpeed.cs b/src/Lumina.Excel/GeneratedSheets/MountSpeed.cs index daed0d75..1c7f4703 100644 --- a/src/Lumina.Excel/GeneratedSheets/MountSpeed.cs +++ b/src/Lumina.Excel/GeneratedSheets/MountSpeed.cs @@ -7,22 +7,18 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "MountSpeed", columnHash: 0x91ab8236 )] - public class MountSpeed : IExcelRow + public class MountSpeed : ExcelRow { - public LazyRow< Quest > Quest; - public uint Unknown1; - public byte Unknown2; + public LazyRow< Quest > Quest { get; set; } + public uint Unknown1 { get; set; } + public byte Unknown2 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Quest = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 0 ), language ); + Quest = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 0 ), language ); Unknown1 = parser.ReadColumn< uint >( 1 ); Unknown2 = parser.ReadColumn< byte >( 2 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/MountTransient.cs b/src/Lumina.Excel/GeneratedSheets/MountTransient.cs index fc07e19d..4a150759 100644 --- a/src/Lumina.Excel/GeneratedSheets/MountTransient.cs +++ b/src/Lumina.Excel/GeneratedSheets/MountTransient.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "MountTransient", columnHash: 0x7f711762 )] - public class MountTransient : IExcelRow + public class MountTransient : ExcelRow { - public SeString Description; - public SeString DescriptionEnhanced; - public SeString Tooltip; + public SeString Description { get; set; } + public SeString DescriptionEnhanced { get; set; } + public SeString Tooltip { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Description = parser.ReadColumn< SeString >( 0 ); DescriptionEnhanced = parser.ReadColumn< SeString >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/MoveTimeline.cs b/src/Lumina.Excel/GeneratedSheets/MoveTimeline.cs index f3df73c0..c1a788c9 100644 --- a/src/Lumina.Excel/GeneratedSheets/MoveTimeline.cs +++ b/src/Lumina.Excel/GeneratedSheets/MoveTimeline.cs @@ -7,38 +7,34 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "MoveTimeline", columnHash: 0xf057da9c )] - public class MoveTimeline : IExcelRow + public class MoveTimeline : ExcelRow { - public LazyRow< ActionTimeline > Idle; - public LazyRow< ActionTimeline > MoveForward; - public LazyRow< ActionTimeline > MoveBack; - public LazyRow< ActionTimeline > MoveLeft; - public LazyRow< ActionTimeline > MoveRight; - public LazyRow< ActionTimeline > MoveUp; - public LazyRow< ActionTimeline > MoveDown; - public LazyRow< ActionTimeline > MoveTurnLeft; - public LazyRow< ActionTimeline > MoveTurnRight; - public LazyRow< ActionTimeline > Extra; + public LazyRow< ActionTimeline > Idle { get; set; } + public LazyRow< ActionTimeline > MoveForward { get; set; } + public LazyRow< ActionTimeline > MoveBack { get; set; } + public LazyRow< ActionTimeline > MoveLeft { get; set; } + public LazyRow< ActionTimeline > MoveRight { get; set; } + public LazyRow< ActionTimeline > MoveUp { get; set; } + public LazyRow< ActionTimeline > MoveDown { get; set; } + public LazyRow< ActionTimeline > MoveTurnLeft { get; set; } + public LazyRow< ActionTimeline > MoveTurnRight { get; set; } + public LazyRow< ActionTimeline > Extra { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Idle = new LazyRow< ActionTimeline >( lumina, parser.ReadColumn< ushort >( 0 ), language ); - MoveForward = new LazyRow< ActionTimeline >( lumina, parser.ReadColumn< ushort >( 1 ), language ); - MoveBack = new LazyRow< ActionTimeline >( lumina, parser.ReadColumn< ushort >( 2 ), language ); - MoveLeft = new LazyRow< ActionTimeline >( lumina, parser.ReadColumn< ushort >( 3 ), language ); - MoveRight = new LazyRow< ActionTimeline >( lumina, parser.ReadColumn< ushort >( 4 ), language ); - MoveUp = new LazyRow< ActionTimeline >( lumina, parser.ReadColumn< ushort >( 5 ), language ); - MoveDown = new LazyRow< ActionTimeline >( lumina, parser.ReadColumn< ushort >( 6 ), language ); - MoveTurnLeft = new LazyRow< ActionTimeline >( lumina, parser.ReadColumn< ushort >( 7 ), language ); - MoveTurnRight = new LazyRow< ActionTimeline >( lumina, parser.ReadColumn< ushort >( 8 ), language ); - Extra = new LazyRow< ActionTimeline >( lumina, parser.ReadColumn< ushort >( 9 ), language ); + Idle = new LazyRow< ActionTimeline >( gameData, parser.ReadColumn< ushort >( 0 ), language ); + MoveForward = new LazyRow< ActionTimeline >( gameData, parser.ReadColumn< ushort >( 1 ), language ); + MoveBack = new LazyRow< ActionTimeline >( gameData, parser.ReadColumn< ushort >( 2 ), language ); + MoveLeft = new LazyRow< ActionTimeline >( gameData, parser.ReadColumn< ushort >( 3 ), language ); + MoveRight = new LazyRow< ActionTimeline >( gameData, parser.ReadColumn< ushort >( 4 ), language ); + MoveUp = new LazyRow< ActionTimeline >( gameData, parser.ReadColumn< ushort >( 5 ), language ); + MoveDown = new LazyRow< ActionTimeline >( gameData, parser.ReadColumn< ushort >( 6 ), language ); + MoveTurnLeft = new LazyRow< ActionTimeline >( gameData, parser.ReadColumn< ushort >( 7 ), language ); + MoveTurnRight = new LazyRow< ActionTimeline >( gameData, parser.ReadColumn< ushort >( 8 ), language ); + Extra = new LazyRow< ActionTimeline >( gameData, parser.ReadColumn< ushort >( 9 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/MoveVfx.cs b/src/Lumina.Excel/GeneratedSheets/MoveVfx.cs index d7abf073..79921ab3 100644 --- a/src/Lumina.Excel/GeneratedSheets/MoveVfx.cs +++ b/src/Lumina.Excel/GeneratedSheets/MoveVfx.cs @@ -7,22 +7,18 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "MoveVfx", columnHash: 0x2020acf6 )] - public class MoveVfx : IExcelRow + public class MoveVfx : ExcelRow { - public LazyRow< VFX > VFXNormal; - public LazyRow< VFX > VFXWalking; + public LazyRow< VFX > VFXNormal { get; set; } + public LazyRow< VFX > VFXWalking { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - VFXNormal = new LazyRow< VFX >( lumina, parser.ReadColumn< ushort >( 0 ), language ); - VFXWalking = new LazyRow< VFX >( lumina, parser.ReadColumn< ushort >( 1 ), language ); + VFXNormal = new LazyRow< VFX >( gameData, parser.ReadColumn< ushort >( 0 ), language ); + VFXWalking = new LazyRow< VFX >( gameData, parser.ReadColumn< ushort >( 1 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/MovieStaffList.cs b/src/Lumina.Excel/GeneratedSheets/MovieStaffList.cs new file mode 100644 index 00000000..d6822fb6 --- /dev/null +++ b/src/Lumina.Excel/GeneratedSheets/MovieStaffList.cs @@ -0,0 +1,28 @@ +// ReSharper disable All + +using Lumina.Text; +using Lumina.Data; +using Lumina.Data.Structs.Excel; + +namespace Lumina.Excel.GeneratedSheets +{ + [Sheet( "MovieStaffList", columnHash: 0xc3212d0e )] + public class MovieStaffList : ExcelRow + { + + public uint Image { get; set; } + public float StartTime { get; set; } + public float EndTime { get; set; } + public sbyte Unknown3 { get; set; } + + public override void PopulateData( RowParser parser, GameData gameData, Language language ) + { + base.PopulateData( parser, gameData, language ); + + Image = parser.ReadColumn< uint >( 0 ); + StartTime = parser.ReadColumn< float >( 1 ); + EndTime = parser.ReadColumn< float >( 2 ); + Unknown3 = parser.ReadColumn< sbyte >( 3 ); + } + } +} \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/MovieSubtitle.cs b/src/Lumina.Excel/GeneratedSheets/MovieSubtitle.cs index f7ba7a8c..79895c55 100644 --- a/src/Lumina.Excel/GeneratedSheets/MovieSubtitle.cs +++ b/src/Lumina.Excel/GeneratedSheets/MovieSubtitle.cs @@ -7,19 +7,15 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "MovieSubtitle", columnHash: 0x07f99ad3 )] - public class MovieSubtitle : IExcelRow + public class MovieSubtitle : ExcelRow { - public float StartTime; - public float EndTime; + public float StartTime { get; set; } + public float EndTime { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); StartTime = parser.ReadColumn< float >( 0 ); EndTime = parser.ReadColumn< float >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/MovieSubtitle500.cs b/src/Lumina.Excel/GeneratedSheets/MovieSubtitle500.cs index 16f4f1e9..d5574a85 100644 --- a/src/Lumina.Excel/GeneratedSheets/MovieSubtitle500.cs +++ b/src/Lumina.Excel/GeneratedSheets/MovieSubtitle500.cs @@ -7,19 +7,15 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "MovieSubtitle500", columnHash: 0x07f99ad3 )] - public class MovieSubtitle500 : IExcelRow + public class MovieSubtitle500 : ExcelRow { - public float StartTime; - public float EndTime; + public float StartTime { get; set; } + public float EndTime { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); StartTime = parser.ReadColumn< float >( 0 ); EndTime = parser.ReadColumn< float >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/MovieSubtitleVoyage.cs b/src/Lumina.Excel/GeneratedSheets/MovieSubtitleVoyage.cs index c5cfab09..5d4ae1ba 100644 --- a/src/Lumina.Excel/GeneratedSheets/MovieSubtitleVoyage.cs +++ b/src/Lumina.Excel/GeneratedSheets/MovieSubtitleVoyage.cs @@ -7,19 +7,15 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "MovieSubtitleVoyage", columnHash: 0x07f99ad3 )] - public class MovieSubtitleVoyage : IExcelRow + public class MovieSubtitleVoyage : ExcelRow { - public float StartTime; - public float EndTime; + public float StartTime { get; set; } + public float EndTime { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); StartTime = parser.ReadColumn< float >( 0 ); EndTime = parser.ReadColumn< float >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/NotebookDivision.cs b/src/Lumina.Excel/GeneratedSheets/NotebookDivision.cs index 129a0213..f420f006 100644 --- a/src/Lumina.Excel/GeneratedSheets/NotebookDivision.cs +++ b/src/Lumina.Excel/GeneratedSheets/NotebookDivision.cs @@ -7,38 +7,34 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "NotebookDivision", columnHash: 0xb4638be9 )] - public class NotebookDivision : IExcelRow + public class NotebookDivision : ExcelRow { - public SeString Name; - public LazyRow< NotebookDivisionCategory > NotebookDivisionCategory; - public byte CraftOpeningLevel; - public byte GatheringOpeningLevel; - public LazyRow< Quest > QuestUnlock; - public byte Unknown5; - public bool Unknown6; - public bool CRPCraft; - public bool BSMCraft; - public bool ARMCraft; - public bool GSMCraft; - public bool LTWCraft; - public bool WVRCraft; - public bool ALCCraft; - public bool CULCraft; + public SeString Name { get; set; } + public LazyRow< NotebookDivisionCategory > NotebookDivisionCategory { get; set; } + public byte CraftOpeningLevel { get; set; } + public byte GatheringOpeningLevel { get; set; } + public LazyRow< Quest > QuestUnlock { get; set; } + public byte Unknown5 { get; set; } + public bool Unknown6 { get; set; } + public bool CRPCraft { get; set; } + public bool BSMCraft { get; set; } + public bool ARMCraft { get; set; } + public bool GSMCraft { get; set; } + public bool LTWCraft { get; set; } + public bool WVRCraft { get; set; } + public bool ALCCraft { get; set; } + public bool CULCraft { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); - NotebookDivisionCategory = new LazyRow< NotebookDivisionCategory >( lumina, parser.ReadColumn< byte >( 1 ), language ); + NotebookDivisionCategory = new LazyRow< NotebookDivisionCategory >( gameData, parser.ReadColumn< byte >( 1 ), language ); CraftOpeningLevel = parser.ReadColumn< byte >( 2 ); GatheringOpeningLevel = parser.ReadColumn< byte >( 3 ); - QuestUnlock = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 4 ), language ); + QuestUnlock = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 4 ), language ); Unknown5 = parser.ReadColumn< byte >( 5 ); Unknown6 = parser.ReadColumn< bool >( 6 ); CRPCraft = parser.ReadColumn< bool >( 7 ); diff --git a/src/Lumina.Excel/GeneratedSheets/NotebookDivisionCategory.cs b/src/Lumina.Excel/GeneratedSheets/NotebookDivisionCategory.cs index b81cda04..179fc7e8 100644 --- a/src/Lumina.Excel/GeneratedSheets/NotebookDivisionCategory.cs +++ b/src/Lumina.Excel/GeneratedSheets/NotebookDivisionCategory.cs @@ -7,19 +7,15 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "NotebookDivisionCategory", columnHash: 0x9ff65ad6 )] - public class NotebookDivisionCategory : IExcelRow + public class NotebookDivisionCategory : ExcelRow { - public SeString Name; - public byte Index; + public SeString Name { get; set; } + public byte Index { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); Index = parser.ReadColumn< byte >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/NotoriousMonster.cs b/src/Lumina.Excel/GeneratedSheets/NotoriousMonster.cs index 3000fe05..a3b0cc57 100644 --- a/src/Lumina.Excel/GeneratedSheets/NotoriousMonster.cs +++ b/src/Lumina.Excel/GeneratedSheets/NotoriousMonster.cs @@ -7,25 +7,21 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "NotoriousMonster", columnHash: 0x307c9206 )] - public class NotoriousMonster : IExcelRow + public class NotoriousMonster : ExcelRow { - public LazyRow< BNpcBase > BNpcBase; - public byte Rank; - public LazyRow< BNpcName > BNpcName; - public ushort Unknown3; + public LazyRow< BNpcBase > BNpcBase { get; set; } + public byte Rank { get; set; } + public LazyRow< BNpcName > BNpcName { get; set; } + public ushort Unknown3 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - BNpcBase = new LazyRow< BNpcBase >( lumina, parser.ReadColumn< int >( 0 ), language ); + BNpcBase = new LazyRow< BNpcBase >( gameData, parser.ReadColumn< int >( 0 ), language ); Rank = parser.ReadColumn< byte >( 1 ); - BNpcName = new LazyRow< BNpcName >( lumina, parser.ReadColumn< uint >( 2 ), language ); + BNpcName = new LazyRow< BNpcName >( gameData, parser.ReadColumn< uint >( 2 ), language ); Unknown3 = parser.ReadColumn< ushort >( 3 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/NpcEquip.cs b/src/Lumina.Excel/GeneratedSheets/NpcEquip.cs index 8380fd37..ec2e6790 100644 --- a/src/Lumina.Excel/GeneratedSheets/NpcEquip.cs +++ b/src/Lumina.Excel/GeneratedSheets/NpcEquip.cs @@ -7,68 +7,64 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "NpcEquip", columnHash: 0xe91c87ba )] - public class NpcEquip : IExcelRow + public class NpcEquip : ExcelRow { - public ulong ModelMainHand; - public LazyRow< Stain > DyeMainHand; - public ulong ModelOffHand; - public LazyRow< Stain > DyeOffHand; - public uint ModelHead; - public LazyRow< Stain > DyeHead; - public bool Visor; - public uint ModelBody; - public LazyRow< Stain > DyeBody; - public uint ModelHands; - public LazyRow< Stain > DyeHands; - public uint ModelLegs; - public LazyRow< Stain > DyeLegs; - public uint ModelFeet; - public LazyRow< Stain > DyeFeet; - public uint ModelEars; - public LazyRow< Stain > DyeEars; - public uint ModelNeck; - public LazyRow< Stain > DyeNeck; - public uint ModelWrists; - public LazyRow< Stain > DyeWrists; - public uint ModelLeftRing; - public LazyRow< Stain > DyeLeftRing; - public uint ModelRightRing; - public LazyRow< Stain > DyeRightRing; + public ulong ModelMainHand { get; set; } + public LazyRow< Stain > DyeMainHand { get; set; } + public ulong ModelOffHand { get; set; } + public LazyRow< Stain > DyeOffHand { get; set; } + public uint ModelHead { get; set; } + public LazyRow< Stain > DyeHead { get; set; } + public bool Visor { get; set; } + public uint ModelBody { get; set; } + public LazyRow< Stain > DyeBody { get; set; } + public uint ModelHands { get; set; } + public LazyRow< Stain > DyeHands { get; set; } + public uint ModelLegs { get; set; } + public LazyRow< Stain > DyeLegs { get; set; } + public uint ModelFeet { get; set; } + public LazyRow< Stain > DyeFeet { get; set; } + public uint ModelEars { get; set; } + public LazyRow< Stain > DyeEars { get; set; } + public uint ModelNeck { get; set; } + public LazyRow< Stain > DyeNeck { get; set; } + public uint ModelWrists { get; set; } + public LazyRow< Stain > DyeWrists { get; set; } + public uint ModelLeftRing { get; set; } + public LazyRow< Stain > DyeLeftRing { get; set; } + public uint ModelRightRing { get; set; } + public LazyRow< Stain > DyeRightRing { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); ModelMainHand = parser.ReadColumn< ulong >( 0 ); - DyeMainHand = new LazyRow< Stain >( lumina, parser.ReadColumn< byte >( 1 ), language ); + DyeMainHand = new LazyRow< Stain >( gameData, parser.ReadColumn< byte >( 1 ), language ); ModelOffHand = parser.ReadColumn< ulong >( 2 ); - DyeOffHand = new LazyRow< Stain >( lumina, parser.ReadColumn< byte >( 3 ), language ); + DyeOffHand = new LazyRow< Stain >( gameData, parser.ReadColumn< byte >( 3 ), language ); ModelHead = parser.ReadColumn< uint >( 4 ); - DyeHead = new LazyRow< Stain >( lumina, parser.ReadColumn< byte >( 5 ), language ); + DyeHead = new LazyRow< Stain >( gameData, parser.ReadColumn< byte >( 5 ), language ); Visor = parser.ReadColumn< bool >( 6 ); ModelBody = parser.ReadColumn< uint >( 7 ); - DyeBody = new LazyRow< Stain >( lumina, parser.ReadColumn< byte >( 8 ), language ); + DyeBody = new LazyRow< Stain >( gameData, parser.ReadColumn< byte >( 8 ), language ); ModelHands = parser.ReadColumn< uint >( 9 ); - DyeHands = new LazyRow< Stain >( lumina, parser.ReadColumn< byte >( 10 ), language ); + DyeHands = new LazyRow< Stain >( gameData, parser.ReadColumn< byte >( 10 ), language ); ModelLegs = parser.ReadColumn< uint >( 11 ); - DyeLegs = new LazyRow< Stain >( lumina, parser.ReadColumn< byte >( 12 ), language ); + DyeLegs = new LazyRow< Stain >( gameData, parser.ReadColumn< byte >( 12 ), language ); ModelFeet = parser.ReadColumn< uint >( 13 ); - DyeFeet = new LazyRow< Stain >( lumina, parser.ReadColumn< byte >( 14 ), language ); + DyeFeet = new LazyRow< Stain >( gameData, parser.ReadColumn< byte >( 14 ), language ); ModelEars = parser.ReadColumn< uint >( 15 ); - DyeEars = new LazyRow< Stain >( lumina, parser.ReadColumn< byte >( 16 ), language ); + DyeEars = new LazyRow< Stain >( gameData, parser.ReadColumn< byte >( 16 ), language ); ModelNeck = parser.ReadColumn< uint >( 17 ); - DyeNeck = new LazyRow< Stain >( lumina, parser.ReadColumn< byte >( 18 ), language ); + DyeNeck = new LazyRow< Stain >( gameData, parser.ReadColumn< byte >( 18 ), language ); ModelWrists = parser.ReadColumn< uint >( 19 ); - DyeWrists = new LazyRow< Stain >( lumina, parser.ReadColumn< byte >( 20 ), language ); + DyeWrists = new LazyRow< Stain >( gameData, parser.ReadColumn< byte >( 20 ), language ); ModelLeftRing = parser.ReadColumn< uint >( 21 ); - DyeLeftRing = new LazyRow< Stain >( lumina, parser.ReadColumn< byte >( 22 ), language ); + DyeLeftRing = new LazyRow< Stain >( gameData, parser.ReadColumn< byte >( 22 ), language ); ModelRightRing = parser.ReadColumn< uint >( 23 ); - DyeRightRing = new LazyRow< Stain >( lumina, parser.ReadColumn< byte >( 24 ), language ); + DyeRightRing = new LazyRow< Stain >( gameData, parser.ReadColumn< byte >( 24 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/NpcYell.cs b/src/Lumina.Excel/GeneratedSheets/NpcYell.cs index 63e89ffc..da2f6ca7 100644 --- a/src/Lumina.Excel/GeneratedSheets/NpcYell.cs +++ b/src/Lumina.Excel/GeneratedSheets/NpcYell.cs @@ -7,28 +7,24 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "NpcYell", columnHash: 0xec4840d6 )] - public class NpcYell : IExcelRow + public class NpcYell : ExcelRow { - public uint Unknown0; - public byte Unknown1; - public bool Unknown2; - public bool Unknown3; - public bool Unknown4; - public byte OutputType; - public float BalloonTime; - public bool IsBalloonSlow; - public bool BattleTalkTime; - public byte Unknown54; - public SeString Text; + public uint Unknown0 { get; set; } + public byte Unknown1 { get; set; } + public bool Unknown2 { get; set; } + public bool Unknown3 { get; set; } + public bool Unknown4 { get; set; } + public byte OutputType { get; set; } + public float BalloonTime { get; set; } + public bool IsBalloonSlow { get; set; } + public bool BattleTalkTime { get; set; } + public byte Unknown54 { get; set; } + public SeString Text { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< uint >( 0 ); Unknown1 = parser.ReadColumn< byte >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/Omen.cs b/src/Lumina.Excel/GeneratedSheets/Omen.cs index 73a4bea7..c142d344 100644 --- a/src/Lumina.Excel/GeneratedSheets/Omen.cs +++ b/src/Lumina.Excel/GeneratedSheets/Omen.cs @@ -7,23 +7,19 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Omen", columnHash: 0xd79b6c3f )] - public class Omen : IExcelRow + public class Omen : ExcelRow { - public SeString Path; - public SeString PathAlly; - public byte Type; - public bool RestrictYScale; - public bool LargeScale; - public sbyte Unknown5; + public SeString Path { get; set; } + public SeString PathAlly { get; set; } + public byte Type { get; set; } + public bool RestrictYScale { get; set; } + public bool LargeScale { get; set; } + public sbyte Unknown5 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Path = parser.ReadColumn< SeString >( 0 ); PathAlly = parser.ReadColumn< SeString >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/OnlineStatus.cs b/src/Lumina.Excel/GeneratedSheets/OnlineStatus.cs index 1d6f92c1..dc999832 100644 --- a/src/Lumina.Excel/GeneratedSheets/OnlineStatus.cs +++ b/src/Lumina.Excel/GeneratedSheets/OnlineStatus.cs @@ -7,22 +7,18 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "OnlineStatus", columnHash: 0xd87db84c )] - public class OnlineStatus : IExcelRow + public class OnlineStatus : ExcelRow { - public bool List; - public bool Unknown1; - public byte Priority; - public SeString Name; - public uint Icon; + public bool List { get; set; } + public bool Unknown1 { get; set; } + public byte Priority { get; set; } + public SeString Name { get; set; } + public uint Icon { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); List = parser.ReadColumn< bool >( 0 ); Unknown1 = parser.ReadColumn< bool >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/OpenContent.cs b/src/Lumina.Excel/GeneratedSheets/OpenContent.cs index e8da88b9..48d0a70e 100644 --- a/src/Lumina.Excel/GeneratedSheets/OpenContent.cs +++ b/src/Lumina.Excel/GeneratedSheets/OpenContent.cs @@ -7,26 +7,22 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "OpenContent", columnHash: 0x170b114d )] - public class OpenContent : IExcelRow + public class OpenContent : ExcelRow { - public LazyRow< ContentFinderCondition >[] Content; - public LazyRow< OpenContentCandidateName >[] CandidateName; + public LazyRow< ContentFinderCondition >[] Content { get; set; } + public LazyRow< OpenContentCandidateName >[] CandidateName { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Content = new LazyRow< ContentFinderCondition >[ 16 ]; for( var i = 0; i < 16; i++ ) - Content[ i ] = new LazyRow< ContentFinderCondition >( lumina, parser.ReadColumn< ushort >( 0 + i ), language ); + Content[ i ] = new LazyRow< ContentFinderCondition >( gameData, parser.ReadColumn< ushort >( 0 + i ), language ); CandidateName = new LazyRow< OpenContentCandidateName >[ 16 ]; for( var i = 0; i < 16; i++ ) - CandidateName[ i ] = new LazyRow< OpenContentCandidateName >( lumina, parser.ReadColumn< uint >( 16 + i ), language ); + CandidateName[ i ] = new LazyRow< OpenContentCandidateName >( gameData, parser.ReadColumn< uint >( 16 + i ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/OpenContentCandidateName.cs b/src/Lumina.Excel/GeneratedSheets/OpenContentCandidateName.cs index 4a0e06ac..0e245ca2 100644 --- a/src/Lumina.Excel/GeneratedSheets/OpenContentCandidateName.cs +++ b/src/Lumina.Excel/GeneratedSheets/OpenContentCandidateName.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "OpenContentCandidateName", columnHash: 0xdebb20e3 )] - public class OpenContentCandidateName : IExcelRow + public class OpenContentCandidateName : ExcelRow { - public SeString Name; + public SeString Name { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/Opening.cs b/src/Lumina.Excel/GeneratedSheets/Opening.cs index 71f8e75b..834661d6 100644 --- a/src/Lumina.Excel/GeneratedSheets/Opening.cs +++ b/src/Lumina.Excel/GeneratedSheets/Opening.cs @@ -7,102 +7,98 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Opening", columnHash: 0xfe684a57 )] - public class Opening : IExcelRow + public class Opening : ExcelRow { - public SeString Name; - public LazyRow< Quest > Quest; - public SeString Unknown2; - public SeString Unknown3; - public SeString Unknown4; - public SeString Unknown5; - public SeString Unknown6; - public SeString Unknown7; - public SeString Unknown8; - public SeString Unknown9; - public SeString Unknown10; - public SeString Unknown11; - public SeString Unknown12; - public SeString Unknown13; - public SeString Unknown14; - public SeString Unknown15; - public SeString Unknown16; - public SeString Unknown17; - public SeString Unknown18; - public SeString Unknown19; - public SeString Unknown20; - public SeString Unknown21; - public SeString Unknown22; - public SeString Unknown23; - public SeString Unknown24; - public SeString Unknown25; - public SeString Unknown26; - public SeString Unknown27; - public SeString Unknown28; - public SeString Unknown29; - public SeString Unknown30; - public SeString Unknown31; - public SeString Unknown32; - public SeString Unknown33; - public SeString Unknown34; - public SeString Unknown35; - public SeString Unknown36; - public SeString Unknown37; - public SeString Unknown38; - public SeString Unknown39; - public SeString Unknown40; - public SeString Unknown41; - public uint Unknown42; - public uint Unknown43; - public uint Unknown44; - public uint Unknown45; - public uint Unknown46; - public uint Unknown47; - public uint Unknown48; - public uint Unknown49; - public uint Unknown50; - public uint Unknown51; - public uint Unknown52; - public uint Unknown53; - public uint Unknown54; - public uint Unknown55; - public uint Unknown56; - public uint Unknown57; - public uint Unknown58; - public uint Unknown59; - public uint Unknown60; - public uint Unknown61; - public uint Unknown62; - public uint Unknown63; - public uint Unknown64; - public uint Unknown65; - public uint Unknown66; - public uint Unknown67; - public uint Unknown68; - public uint Unknown69; - public uint Unknown70; - public uint Unknown71; - public uint Unknown72; - public uint Unknown73; - public uint Unknown74; - public uint Unknown75; - public uint Unknown76; - public uint Unknown77; - public uint Unknown78; - public uint Unknown79; - public uint Unknown80; - public uint Unknown81; + public SeString Name { get; set; } + public LazyRow< Quest > Quest { get; set; } + public SeString Unknown2 { get; set; } + public SeString Unknown3 { get; set; } + public SeString Unknown4 { get; set; } + public SeString Unknown5 { get; set; } + public SeString Unknown6 { get; set; } + public SeString Unknown7 { get; set; } + public SeString Unknown8 { get; set; } + public SeString Unknown9 { get; set; } + public SeString Unknown10 { get; set; } + public SeString Unknown11 { get; set; } + public SeString Unknown12 { get; set; } + public SeString Unknown13 { get; set; } + public SeString Unknown14 { get; set; } + public SeString Unknown15 { get; set; } + public SeString Unknown16 { get; set; } + public SeString Unknown17 { get; set; } + public SeString Unknown18 { get; set; } + public SeString Unknown19 { get; set; } + public SeString Unknown20 { get; set; } + public SeString Unknown21 { get; set; } + public SeString Unknown22 { get; set; } + public SeString Unknown23 { get; set; } + public SeString Unknown24 { get; set; } + public SeString Unknown25 { get; set; } + public SeString Unknown26 { get; set; } + public SeString Unknown27 { get; set; } + public SeString Unknown28 { get; set; } + public SeString Unknown29 { get; set; } + public SeString Unknown30 { get; set; } + public SeString Unknown31 { get; set; } + public SeString Unknown32 { get; set; } + public SeString Unknown33 { get; set; } + public SeString Unknown34 { get; set; } + public SeString Unknown35 { get; set; } + public SeString Unknown36 { get; set; } + public SeString Unknown37 { get; set; } + public SeString Unknown38 { get; set; } + public SeString Unknown39 { get; set; } + public SeString Unknown40 { get; set; } + public SeString Unknown41 { get; set; } + public uint Unknown42 { get; set; } + public uint Unknown43 { get; set; } + public uint Unknown44 { get; set; } + public uint Unknown45 { get; set; } + public uint Unknown46 { get; set; } + public uint Unknown47 { get; set; } + public uint Unknown48 { get; set; } + public uint Unknown49 { get; set; } + public uint Unknown50 { get; set; } + public uint Unknown51 { get; set; } + public uint Unknown52 { get; set; } + public uint Unknown53 { get; set; } + public uint Unknown54 { get; set; } + public uint Unknown55 { get; set; } + public uint Unknown56 { get; set; } + public uint Unknown57 { get; set; } + public uint Unknown58 { get; set; } + public uint Unknown59 { get; set; } + public uint Unknown60 { get; set; } + public uint Unknown61 { get; set; } + public uint Unknown62 { get; set; } + public uint Unknown63 { get; set; } + public uint Unknown64 { get; set; } + public uint Unknown65 { get; set; } + public uint Unknown66 { get; set; } + public uint Unknown67 { get; set; } + public uint Unknown68 { get; set; } + public uint Unknown69 { get; set; } + public uint Unknown70 { get; set; } + public uint Unknown71 { get; set; } + public uint Unknown72 { get; set; } + public uint Unknown73 { get; set; } + public uint Unknown74 { get; set; } + public uint Unknown75 { get; set; } + public uint Unknown76 { get; set; } + public uint Unknown77 { get; set; } + public uint Unknown78 { get; set; } + public uint Unknown79 { get; set; } + public uint Unknown80 { get; set; } + public uint Unknown81 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); - Quest = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 1 ), language ); + Quest = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 1 ), language ); Unknown2 = parser.ReadColumn< SeString >( 2 ); Unknown3 = parser.ReadColumn< SeString >( 3 ); Unknown4 = parser.ReadColumn< SeString >( 4 ); diff --git a/src/Lumina.Excel/GeneratedSheets/Orchestrion.cs b/src/Lumina.Excel/GeneratedSheets/Orchestrion.cs index 46a6794e..2c049965 100644 --- a/src/Lumina.Excel/GeneratedSheets/Orchestrion.cs +++ b/src/Lumina.Excel/GeneratedSheets/Orchestrion.cs @@ -7,19 +7,15 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Orchestrion", columnHash: 0x9db0e48f )] - public class Orchestrion : IExcelRow + public class Orchestrion : ExcelRow { - public SeString Name; - public SeString Description; + public SeString Name { get; set; } + public SeString Description { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); Description = parser.ReadColumn< SeString >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/OrchestrionCategory.cs b/src/Lumina.Excel/GeneratedSheets/OrchestrionCategory.cs index b5e7600f..1792b9eb 100644 --- a/src/Lumina.Excel/GeneratedSheets/OrchestrionCategory.cs +++ b/src/Lumina.Excel/GeneratedSheets/OrchestrionCategory.cs @@ -7,25 +7,21 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "OrchestrionCategory", columnHash: 0x7ac3ee00 )] - public class OrchestrionCategory : IExcelRow + public class OrchestrionCategory : ExcelRow { - public SeString Name; - public byte HideCategory; - public uint Unknown2; - public byte Order; + public SeString Name { get; set; } + public byte HideOrder { get; set; } + public uint Icon { get; set; } + public byte Order { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); - HideCategory = parser.ReadColumn< byte >( 1 ); - Unknown2 = parser.ReadColumn< uint >( 2 ); + HideOrder = parser.ReadColumn< byte >( 1 ); + Icon = parser.ReadColumn< uint >( 2 ); Order = parser.ReadColumn< byte >( 3 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/OrchestrionPath.cs b/src/Lumina.Excel/GeneratedSheets/OrchestrionPath.cs index 184d198d..7cc0b892 100644 --- a/src/Lumina.Excel/GeneratedSheets/OrchestrionPath.cs +++ b/src/Lumina.Excel/GeneratedSheets/OrchestrionPath.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "OrchestrionPath", columnHash: 0xdebb20e3 )] - public class OrchestrionPath : IExcelRow + public class OrchestrionPath : ExcelRow { - public SeString File; + public SeString File { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); File = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/OrchestrionUiparam.cs b/src/Lumina.Excel/GeneratedSheets/OrchestrionUiparam.cs index 58b8c43a..42d66535 100644 --- a/src/Lumina.Excel/GeneratedSheets/OrchestrionUiparam.cs +++ b/src/Lumina.Excel/GeneratedSheets/OrchestrionUiparam.cs @@ -7,21 +7,17 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "OrchestrionUiparam", columnHash: 0xd73eab80 )] - public class OrchestrionUiparam : IExcelRow + public class OrchestrionUiparam : ExcelRow { - public LazyRow< OrchestrionCategory > OrchestrionCategory; - public ushort Order; + public LazyRow< OrchestrionCategory > OrchestrionCategory { get; set; } + public ushort Order { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - OrchestrionCategory = new LazyRow< OrchestrionCategory >( lumina, parser.ReadColumn< byte >( 0 ), language ); + OrchestrionCategory = new LazyRow< OrchestrionCategory >( gameData, parser.ReadColumn< byte >( 0 ), language ); Order = parser.ReadColumn< ushort >( 1 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/Ornament.cs b/src/Lumina.Excel/GeneratedSheets/Ornament.cs index 1af75592..a0f45ca6 100644 --- a/src/Lumina.Excel/GeneratedSheets/Ornament.cs +++ b/src/Lumina.Excel/GeneratedSheets/Ornament.cs @@ -7,32 +7,28 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Ornament", columnHash: 0x6768819a )] - public class Ornament : IExcelRow + public class Ornament : ExcelRow { - public ushort Model; - public byte Unknown1; - public byte Unknown2; - public bool Unknown3; - public short Order; - public ushort Icon; - public ushort Transient; - public SeString Singular; - public sbyte Adjective; - public SeString Plural; - public sbyte PossessivePronoun; - public sbyte StartsWithVowel; - public sbyte Unknown12; - public sbyte Pronoun; - public sbyte Article; + public ushort Model { get; set; } + public byte Unknown1 { get; set; } + public byte Unknown2 { get; set; } + public bool Unknown3 { get; set; } + public short Order { get; set; } + public ushort Icon { get; set; } + public ushort Transient { get; set; } + public SeString Singular { get; set; } + public sbyte Adjective { get; set; } + public SeString Plural { get; set; } + public sbyte PossessivePronoun { get; set; } + public sbyte StartsWithVowel { get; set; } + public sbyte Unknown12 { get; set; } + public sbyte Pronoun { get; set; } + public sbyte Article { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Model = parser.ReadColumn< ushort >( 0 ); Unknown1 = parser.ReadColumn< byte >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/ParamGrow.cs b/src/Lumina.Excel/GeneratedSheets/ParamGrow.cs index 407e5525..4e3b31a5 100644 --- a/src/Lumina.Excel/GeneratedSheets/ParamGrow.cs +++ b/src/Lumina.Excel/GeneratedSheets/ParamGrow.cs @@ -7,32 +7,28 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ParamGrow", columnHash: 0x64a92445 )] - public class ParamGrow : IExcelRow + public class ParamGrow : ExcelRow { - public int ExpToNext; - public byte AdditionalActions; - public byte ApplyAction; - public ushort ScaledQuestXP; - public int MpModifier; - public int BaseSpeed; - public int LevelModifier; - public byte QuestExpModifier; - public ushort HpModifier; - public int HuntingLogExpReward; - public int MonsterNoteSeals; - public ushort ItemLevelSync; - public ushort ProperDungeon; - public ushort ProperGuildOrder; - public ushort CraftingLevel; + public int ExpToNext { get; set; } + public byte AdditionalActions { get; set; } + public byte ApplyAction { get; set; } + public ushort ScaledQuestXP { get; set; } + public int MpModifier { get; set; } + public int BaseSpeed { get; set; } + public int LevelModifier { get; set; } + public byte QuestExpModifier { get; set; } + public ushort HpModifier { get; set; } + public int HuntingLogExpReward { get; set; } + public int MonsterNoteSeals { get; set; } + public ushort ItemLevelSync { get; set; } + public ushort ProperDungeon { get; set; } + public ushort ProperGuildOrder { get; set; } + public ushort CraftingLevel { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); ExpToNext = parser.ReadColumn< int >( 0 ); AdditionalActions = parser.ReadColumn< byte >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/PartyContent.cs b/src/Lumina.Excel/GeneratedSheets/PartyContent.cs index 92f01a62..78e1c3e6 100644 --- a/src/Lumina.Excel/GeneratedSheets/PartyContent.cs +++ b/src/Lumina.Excel/GeneratedSheets/PartyContent.cs @@ -7,88 +7,42 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "PartyContent", columnHash: 0x0fe3ae35 )] - public class PartyContent : IExcelRow + public class PartyContent : ExcelRow { - public byte Key; - public ushort TimeLimit; - public bool Name; - public LazyRow< PartyContentTextData > TextDataStart; - public LazyRow< PartyContentTextData > TextDataEnd; - public uint Unknown5; - public uint Unknown6; - public uint Unknown7; - public uint Unknown8; - public uint Unknown9; - public uint Unknown10; - public uint Unknown11; - public uint Unknown12; - public uint Unknown13; - public uint Unknown14; - public uint Unknown15; - public uint Unknown16; - public uint Unknown17; - public uint Unknown18; - public uint Unknown19; - public uint Unknown20; - public uint Unknown21; - public uint Unknown22; - public uint Unknown23; - public uint Unknown24; - public uint Unknown25; - public uint Unknown26; - public uint Unknown27; - public uint Unknown28; - public uint Unknown29; - public uint Unknown30; - public uint Unknown31; - public ushort Unknown32; - public LazyRow< ContentFinderCondition > ContentFinderCondition; - public uint Image; - public byte Unknown35; + public byte Key { get; set; } + public ushort TimeLimit { get; set; } + public bool Name { get; set; } + public LazyRow< PartyContentTextData > TextDataStart { get; set; } + public LazyRow< PartyContentTextData > TextDataEnd { get; set; } + public uint[] LGBEventObject0 { get; set; } + public uint[] LGBEventRange { get; set; } + public uint[] LGBEventObject1 { get; set; } + public ushort Unknown32 { get; set; } + public LazyRow< ContentFinderCondition > ContentFinderCondition { get; set; } + public uint Image { get; set; } + public byte Unknown35 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Key = parser.ReadColumn< byte >( 0 ); TimeLimit = parser.ReadColumn< ushort >( 1 ); Name = parser.ReadColumn< bool >( 2 ); - TextDataStart = new LazyRow< PartyContentTextData >( lumina, parser.ReadColumn< uint >( 3 ), language ); - TextDataEnd = new LazyRow< PartyContentTextData >( lumina, parser.ReadColumn< uint >( 4 ), language ); - Unknown5 = parser.ReadColumn< uint >( 5 ); - Unknown6 = parser.ReadColumn< uint >( 6 ); - Unknown7 = parser.ReadColumn< uint >( 7 ); - Unknown8 = parser.ReadColumn< uint >( 8 ); - Unknown9 = parser.ReadColumn< uint >( 9 ); - Unknown10 = parser.ReadColumn< uint >( 10 ); - Unknown11 = parser.ReadColumn< uint >( 11 ); - Unknown12 = parser.ReadColumn< uint >( 12 ); - Unknown13 = parser.ReadColumn< uint >( 13 ); - Unknown14 = parser.ReadColumn< uint >( 14 ); - Unknown15 = parser.ReadColumn< uint >( 15 ); - Unknown16 = parser.ReadColumn< uint >( 16 ); - Unknown17 = parser.ReadColumn< uint >( 17 ); - Unknown18 = parser.ReadColumn< uint >( 18 ); - Unknown19 = parser.ReadColumn< uint >( 19 ); - Unknown20 = parser.ReadColumn< uint >( 20 ); - Unknown21 = parser.ReadColumn< uint >( 21 ); - Unknown22 = parser.ReadColumn< uint >( 22 ); - Unknown23 = parser.ReadColumn< uint >( 23 ); - Unknown24 = parser.ReadColumn< uint >( 24 ); - Unknown25 = parser.ReadColumn< uint >( 25 ); - Unknown26 = parser.ReadColumn< uint >( 26 ); - Unknown27 = parser.ReadColumn< uint >( 27 ); - Unknown28 = parser.ReadColumn< uint >( 28 ); - Unknown29 = parser.ReadColumn< uint >( 29 ); - Unknown30 = parser.ReadColumn< uint >( 30 ); - Unknown31 = parser.ReadColumn< uint >( 31 ); + TextDataStart = new LazyRow< PartyContentTextData >( gameData, parser.ReadColumn< uint >( 3 ), language ); + TextDataEnd = new LazyRow< PartyContentTextData >( gameData, parser.ReadColumn< uint >( 4 ), language ); + LGBEventObject0 = new uint[ 9 ]; + for( var i = 0; i < 9; i++ ) + LGBEventObject0[ i ] = parser.ReadColumn< uint >( 5 + i ); + LGBEventRange = new uint[ 9 ]; + for( var i = 0; i < 9; i++ ) + LGBEventRange[ i ] = parser.ReadColumn< uint >( 14 + i ); + LGBEventObject1 = new uint[ 9 ]; + for( var i = 0; i < 9; i++ ) + LGBEventObject1[ i ] = parser.ReadColumn< uint >( 23 + i ); Unknown32 = parser.ReadColumn< ushort >( 32 ); - ContentFinderCondition = new LazyRow< ContentFinderCondition >( lumina, parser.ReadColumn< ushort >( 33 ), language ); + ContentFinderCondition = new LazyRow< ContentFinderCondition >( gameData, parser.ReadColumn< ushort >( 33 ), language ); Image = parser.ReadColumn< uint >( 34 ); Unknown35 = parser.ReadColumn< byte >( 35 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/PartyContentCutscene.cs b/src/Lumina.Excel/GeneratedSheets/PartyContentCutscene.cs index 61e3d5c5..974a986f 100644 --- a/src/Lumina.Excel/GeneratedSheets/PartyContentCutscene.cs +++ b/src/Lumina.Excel/GeneratedSheets/PartyContentCutscene.cs @@ -7,21 +7,17 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "PartyContentCutscene", columnHash: 0x5d58cc84 )] - public class PartyContentCutscene : IExcelRow + public class PartyContentCutscene : ExcelRow { - public LazyRow< Cutscene > Cutscene; - public uint Unknown1; + public LazyRow< Cutscene > Cutscene { get; set; } + public uint Unknown1 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Cutscene = new LazyRow< Cutscene >( lumina, parser.ReadColumn< uint >( 0 ), language ); + Cutscene = new LazyRow< Cutscene >( gameData, parser.ReadColumn< uint >( 0 ), language ); Unknown1 = parser.ReadColumn< uint >( 1 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/PartyContentTextData.cs b/src/Lumina.Excel/GeneratedSheets/PartyContentTextData.cs index 585e5da6..8769c1a5 100644 --- a/src/Lumina.Excel/GeneratedSheets/PartyContentTextData.cs +++ b/src/Lumina.Excel/GeneratedSheets/PartyContentTextData.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "PartyContentTextData", columnHash: 0xdebb20e3 )] - public class PartyContentTextData : IExcelRow + public class PartyContentTextData : ExcelRow { - public SeString Data; + public SeString Data { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Data = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/PatchMark.cs b/src/Lumina.Excel/GeneratedSheets/PatchMark.cs index 6342e6ff..61bf34fb 100644 --- a/src/Lumina.Excel/GeneratedSheets/PatchMark.cs +++ b/src/Lumina.Excel/GeneratedSheets/PatchMark.cs @@ -7,25 +7,21 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "PatchMark", columnHash: 0x4b87e076 )] - public class PatchMark : IExcelRow + public class PatchMark : ExcelRow { - public sbyte Category; - public byte SubCategoryType; - public ushort SubCategory; - public byte Unknown3; - public uint Unknown4; - public uint MarkID; - public byte Version; - public ushort Unknown7; + public sbyte Category { get; set; } + public byte SubCategoryType { get; set; } + public ushort SubCategory { get; set; } + public byte Unknown3 { get; set; } + public uint Unknown4 { get; set; } + public uint MarkID { get; set; } + public byte Version { get; set; } + public ushort Unknown7 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Category = parser.ReadColumn< sbyte >( 0 ); SubCategoryType = parser.ReadColumn< byte >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/Perform.cs b/src/Lumina.Excel/GeneratedSheets/Perform.cs index c110dba0..206b1d4c 100644 --- a/src/Lumina.Excel/GeneratedSheets/Perform.cs +++ b/src/Lumina.Excel/GeneratedSheets/Perform.cs @@ -7,42 +7,38 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Perform", columnHash: 0x48a99e9c )] - public class Perform : IExcelRow + public class Perform : ExcelRow { - public SeString Name; - public bool Unknown1; - public ulong ModelKey; - public LazyRow< ActionTimeline > AnimationStart; - public LazyRow< ActionTimeline > AnimationEnd; - public LazyRow< ActionTimeline > AnimationIdle; - public LazyRow< ActionTimeline > AnimationPlay01; - public LazyRow< ActionTimeline > AnimationPlay02; - public LazyRow< ActionTimeline > StopAnimation; - public SeString Instrument; - public int Unknown10; - public LazyRow< PerformTransient > Transient; + public SeString Name { get; set; } + public bool Unknown1 { get; set; } + public ulong ModelKey { get; set; } + public LazyRow< ActionTimeline > AnimationStart { get; set; } + public LazyRow< ActionTimeline > AnimationEnd { get; set; } + public LazyRow< ActionTimeline > AnimationIdle { get; set; } + public LazyRow< ActionTimeline > AnimationPlay01 { get; set; } + public LazyRow< ActionTimeline > AnimationPlay02 { get; set; } + public LazyRow< ActionTimeline > StopAnimation { get; set; } + public SeString Instrument { get; set; } + public int Unknown10 { get; set; } + public LazyRow< PerformTransient > Transient { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); Unknown1 = parser.ReadColumn< bool >( 1 ); ModelKey = parser.ReadColumn< ulong >( 2 ); - AnimationStart = new LazyRow< ActionTimeline >( lumina, parser.ReadColumn< ushort >( 3 ), language ); - AnimationEnd = new LazyRow< ActionTimeline >( lumina, parser.ReadColumn< ushort >( 4 ), language ); - AnimationIdle = new LazyRow< ActionTimeline >( lumina, parser.ReadColumn< ushort >( 5 ), language ); - AnimationPlay01 = new LazyRow< ActionTimeline >( lumina, parser.ReadColumn< ushort >( 6 ), language ); - AnimationPlay02 = new LazyRow< ActionTimeline >( lumina, parser.ReadColumn< ushort >( 7 ), language ); - StopAnimation = new LazyRow< ActionTimeline >( lumina, parser.ReadColumn< int >( 8 ), language ); + AnimationStart = new LazyRow< ActionTimeline >( gameData, parser.ReadColumn< ushort >( 3 ), language ); + AnimationEnd = new LazyRow< ActionTimeline >( gameData, parser.ReadColumn< ushort >( 4 ), language ); + AnimationIdle = new LazyRow< ActionTimeline >( gameData, parser.ReadColumn< ushort >( 5 ), language ); + AnimationPlay01 = new LazyRow< ActionTimeline >( gameData, parser.ReadColumn< ushort >( 6 ), language ); + AnimationPlay02 = new LazyRow< ActionTimeline >( gameData, parser.ReadColumn< ushort >( 7 ), language ); + StopAnimation = new LazyRow< ActionTimeline >( gameData, parser.ReadColumn< int >( 8 ), language ); Instrument = parser.ReadColumn< SeString >( 9 ); Unknown10 = parser.ReadColumn< int >( 10 ); - Transient = new LazyRow< PerformTransient >( lumina, parser.ReadColumn< byte >( 11 ), language ); + Transient = new LazyRow< PerformTransient >( gameData, parser.ReadColumn< byte >( 11 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/PerformTransient.cs b/src/Lumina.Excel/GeneratedSheets/PerformTransient.cs index 9f992e77..23eea1d5 100644 --- a/src/Lumina.Excel/GeneratedSheets/PerformTransient.cs +++ b/src/Lumina.Excel/GeneratedSheets/PerformTransient.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "PerformTransient", columnHash: 0xdebb20e3 )] - public class PerformTransient : IExcelRow + public class PerformTransient : ExcelRow { - public SeString Text; + public SeString Text { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Text = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/Pet.cs b/src/Lumina.Excel/GeneratedSheets/Pet.cs index 02256c3d..4b8f1e6a 100644 --- a/src/Lumina.Excel/GeneratedSheets/Pet.cs +++ b/src/Lumina.Excel/GeneratedSheets/Pet.cs @@ -7,30 +7,26 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Pet", columnHash: 0x9c5824d1 )] - public class Pet : IExcelRow + public class Pet : ExcelRow { - public SeString Name; - public ushort Unknown1; - public ushort Unknown2; - public ushort Unknown3; - public ushort Unknown4; - public ushort Unknown5; - public bool Unknown6; - public bool Unknown7; - public bool Unknown8; - public sbyte Unknown9; - public byte Unknown10; - public byte Unknown11; - public byte Unknown12; + public SeString Name { get; set; } + public ushort Unknown1 { get; set; } + public ushort Unknown2 { get; set; } + public ushort Unknown3 { get; set; } + public ushort Unknown4 { get; set; } + public ushort Unknown5 { get; set; } + public bool Unknown6 { get; set; } + public bool Unknown7 { get; set; } + public bool Unknown8 { get; set; } + public sbyte Unknown9 { get; set; } + public byte Unknown10 { get; set; } + public byte Unknown11 { get; set; } + public byte Unknown12 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); Unknown1 = parser.ReadColumn< ushort >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/PetAction.cs b/src/Lumina.Excel/GeneratedSheets/PetAction.cs index 0c70bff6..049ed233 100644 --- a/src/Lumina.Excel/GeneratedSheets/PetAction.cs +++ b/src/Lumina.Excel/GeneratedSheets/PetAction.cs @@ -7,31 +7,27 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "PetAction", columnHash: 0x5e492849 )] - public class PetAction : IExcelRow + public class PetAction : ExcelRow { - public SeString Name; - public SeString Description; - public int Icon; - public LazyRow< Action > Action; - public LazyRow< Pet > Pet; - public bool MasterOrder; - public bool DisableOrder; - public bool Unknown7; + public SeString Name { get; set; } + public SeString Description { get; set; } + public int Icon { get; set; } + public LazyRow< Action > Action { get; set; } + public LazyRow< Pet > Pet { get; set; } + public bool MasterOrder { get; set; } + public bool DisableOrder { get; set; } + public bool Unknown7 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); Description = parser.ReadColumn< SeString >( 1 ); Icon = parser.ReadColumn< int >( 2 ); - Action = new LazyRow< Action >( lumina, parser.ReadColumn< ushort >( 3 ), language ); - Pet = new LazyRow< Pet >( lumina, parser.ReadColumn< byte >( 4 ), language ); + Action = new LazyRow< Action >( gameData, parser.ReadColumn< ushort >( 3 ), language ); + Pet = new LazyRow< Pet >( gameData, parser.ReadColumn< byte >( 4 ), language ); MasterOrder = parser.ReadColumn< bool >( 5 ); DisableOrder = parser.ReadColumn< bool >( 6 ); Unknown7 = parser.ReadColumn< bool >( 7 ); diff --git a/src/Lumina.Excel/GeneratedSheets/PhysicsGroup.cs b/src/Lumina.Excel/GeneratedSheets/PhysicsGroup.cs index 8c8e161b..e763655b 100644 --- a/src/Lumina.Excel/GeneratedSheets/PhysicsGroup.cs +++ b/src/Lumina.Excel/GeneratedSheets/PhysicsGroup.cs @@ -7,24 +7,20 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "PhysicsGroup", columnHash: 0xfa594271 )] - public class PhysicsGroup : IExcelRow + public class PhysicsGroup : ExcelRow { - public float[] SimulationTime; - public float[] PS3SimulationTime; - public bool ResetByLookAt; - public float RootFollowingGame; - public float RootFollowingCutScene; - public sbyte[] ConfigSwitch; - public bool ForceAttractByPhysicsOff; + public float[] SimulationTime { get; set; } + public float[] PS3SimulationTime { get; set; } + public bool ResetByLookAt { get; set; } + public float RootFollowingGame { get; set; } + public float RootFollowingCutScene { get; set; } + public sbyte[] ConfigSwitch { get; set; } + public bool ForceAttractByPhysicsOff { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); SimulationTime = new float[ 6 ]; for( var i = 0; i < 6; i++ ) diff --git a/src/Lumina.Excel/GeneratedSheets/PhysicsWind.cs b/src/Lumina.Excel/GeneratedSheets/PhysicsWind.cs index 9a1da278..62fe2fcb 100644 --- a/src/Lumina.Excel/GeneratedSheets/PhysicsWind.cs +++ b/src/Lumina.Excel/GeneratedSheets/PhysicsWind.cs @@ -7,23 +7,19 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "PhysicsWind", columnHash: 0x3bc4120f )] - public class PhysicsWind : IExcelRow + public class PhysicsWind : ExcelRow { - public float Threshold; - public float Amplitude; - public float AmplitudeFrequency; - public float PowerMin; - public float PowerMax; - public float PowerFrequency; + public float Threshold { get; set; } + public float Amplitude { get; set; } + public float AmplitudeFrequency { get; set; } + public float PowerMin { get; set; } + public float PowerMax { get; set; } + public float PowerFrequency { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Threshold = parser.ReadColumn< float >( 0 ); Amplitude = parser.ReadColumn< float >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/Picture.cs b/src/Lumina.Excel/GeneratedSheets/Picture.cs index 31d3ca08..bff189b8 100644 --- a/src/Lumina.Excel/GeneratedSheets/Picture.cs +++ b/src/Lumina.Excel/GeneratedSheets/Picture.cs @@ -7,21 +7,17 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Picture", columnHash: 0xfaedad07 )] - public class Picture : IExcelRow + public class Picture : ExcelRow { - public LazyRow< Item > Item; - public int Image; + public LazyRow< Item > Item { get; set; } + public int Image { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Item = new LazyRow< Item >( lumina, parser.ReadColumn< int >( 0 ), language ); + Item = new LazyRow< Item >( gameData, parser.ReadColumn< int >( 0 ), language ); Image = parser.ReadColumn< int >( 1 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/PlaceName.cs b/src/Lumina.Excel/GeneratedSheets/PlaceName.cs index 307766a0..42cd304f 100644 --- a/src/Lumina.Excel/GeneratedSheets/PlaceName.cs +++ b/src/Lumina.Excel/GeneratedSheets/PlaceName.cs @@ -7,27 +7,23 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "PlaceName", columnHash: 0x46ef07bb )] - public class PlaceName : IExcelRow + public class PlaceName : ExcelRow { - public SeString Name; - public sbyte Unknown1; - public SeString NameNoArticle; - public sbyte Unknown3; - public sbyte Unknown4; - public sbyte Unknown5; - public sbyte Unknown6; - public sbyte Unknown7; - public SeString Unknown8; - public byte Unknown9; + public SeString Name { get; set; } + public sbyte Unknown1 { get; set; } + public SeString NameNoArticle { get; set; } + public sbyte Unknown3 { get; set; } + public sbyte Unknown4 { get; set; } + public sbyte Unknown5 { get; set; } + public sbyte Unknown6 { get; set; } + public sbyte Unknown7 { get; set; } + public SeString Unknown8 { get; set; } + public byte Unknown9 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); Unknown1 = parser.ReadColumn< sbyte >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/PlantPotFlowerSeed.cs b/src/Lumina.Excel/GeneratedSheets/PlantPotFlowerSeed.cs index 9fa1b53a..f65345c9 100644 --- a/src/Lumina.Excel/GeneratedSheets/PlantPotFlowerSeed.cs +++ b/src/Lumina.Excel/GeneratedSheets/PlantPotFlowerSeed.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "PlantPotFlowerSeed", columnHash: 0x84d0ceef )] - public class PlantPotFlowerSeed : IExcelRow + public class PlantPotFlowerSeed : ExcelRow { - public uint[] SeedIcon; + public uint[] SeedIcon { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); SeedIcon = new uint[ 9 ]; for( var i = 0; i < 9; i++ ) diff --git a/src/Lumina.Excel/GeneratedSheets/PreHandler.cs b/src/Lumina.Excel/GeneratedSheets/PreHandler.cs index 0858779f..fe87bbad 100644 --- a/src/Lumina.Excel/GeneratedSheets/PreHandler.cs +++ b/src/Lumina.Excel/GeneratedSheets/PreHandler.cs @@ -7,31 +7,27 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "PreHandler", columnHash: 0x724c1806 )] - public class PreHandler : IExcelRow + public class PreHandler : ExcelRow { - public SeString Unknown0; - public uint Image; - public uint Target; - public LazyRow< Quest > UnlockQuest; - public LazyRow< DefaultTalk > AcceptMessage; - public LazyRow< DefaultTalk > DenyMessage; - public byte Unknown6; + public SeString Unknown0 { get; set; } + public uint Image { get; set; } + public uint Target { get; set; } + public LazyRow< Quest > UnlockQuest { get; set; } + public LazyRow< DefaultTalk > AcceptMessage { get; set; } + public LazyRow< DefaultTalk > DenyMessage { get; set; } + public byte Unknown6 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< SeString >( 0 ); Image = parser.ReadColumn< uint >( 1 ); Target = parser.ReadColumn< uint >( 2 ); - UnlockQuest = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 3 ), language ); - AcceptMessage = new LazyRow< DefaultTalk >( lumina, parser.ReadColumn< uint >( 4 ), language ); - DenyMessage = new LazyRow< DefaultTalk >( lumina, parser.ReadColumn< uint >( 5 ), language ); + UnlockQuest = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 3 ), language ); + AcceptMessage = new LazyRow< DefaultTalk >( gameData, parser.ReadColumn< uint >( 4 ), language ); + DenyMessage = new LazyRow< DefaultTalk >( gameData, parser.ReadColumn< uint >( 5 ), language ); Unknown6 = parser.ReadColumn< byte >( 6 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/PresetCamera.cs b/src/Lumina.Excel/GeneratedSheets/PresetCamera.cs index e2cda887..0a0fd146 100644 --- a/src/Lumina.Excel/GeneratedSheets/PresetCamera.cs +++ b/src/Lumina.Excel/GeneratedSheets/PresetCamera.cs @@ -7,34 +7,30 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "PresetCamera", columnHash: 0x7d6930eb )] - public class PresetCamera : IExcelRow + public class PresetCamera : ExcelRow { - public ushort EID; - public float PosX; - public float PosY; - public float PosZ; - public float Elezen; - public float Lalafell; - public float Miqote; - public float Roe; - public float Hrothgar; - public float Viera; - public float Hyur_F; - public float Elezen_F; - public float Lalafell_F; - public float Miqote_F; - public float Roe_F; - public float Hrothgar_F; - public float Viera_F; + public ushort EID { get; set; } + public float PosX { get; set; } + public float PosY { get; set; } + public float PosZ { get; set; } + public float Elezen { get; set; } + public float Lalafell { get; set; } + public float Miqote { get; set; } + public float Roe { get; set; } + public float Hrothgar { get; set; } + public float Viera { get; set; } + public float Hyur_F { get; set; } + public float Elezen_F { get; set; } + public float Lalafell_F { get; set; } + public float Miqote_F { get; set; } + public float Roe_F { get; set; } + public float Hrothgar_F { get; set; } + public float Viera_F { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); EID = parser.ReadColumn< ushort >( 0 ); PosX = parser.ReadColumn< float >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/PresetCameraAdjust.cs b/src/Lumina.Excel/GeneratedSheets/PresetCameraAdjust.cs index 7d6bef7f..07a6fd56 100644 --- a/src/Lumina.Excel/GeneratedSheets/PresetCameraAdjust.cs +++ b/src/Lumina.Excel/GeneratedSheets/PresetCameraAdjust.cs @@ -7,31 +7,27 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "PresetCameraAdjust", columnHash: 0x4cdff077 )] - public class PresetCameraAdjust : IExcelRow + public class PresetCameraAdjust : ExcelRow { - public float Hyur_M; - public float Hyur_F; - public float Elezen_M; - public float Elezen_F; - public float Lalafell_M; - public float Lalafell_F; - public float Miqote_M; - public float Miqote_F; - public float Roe_M; - public float Roe_F; - public float Hrothgar_M; - public float Hrothgar_F; - public float Viera_M; - public float Viera_F; + public float Hyur_M { get; set; } + public float Hyur_F { get; set; } + public float Elezen_M { get; set; } + public float Elezen_F { get; set; } + public float Lalafell_M { get; set; } + public float Lalafell_F { get; set; } + public float Miqote_M { get; set; } + public float Miqote_F { get; set; } + public float Roe_M { get; set; } + public float Roe_F { get; set; } + public float Hrothgar_M { get; set; } + public float Hrothgar_F { get; set; } + public float Viera_M { get; set; } + public float Viera_F { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Hyur_M = parser.ReadColumn< float >( 0 ); Hyur_F = parser.ReadColumn< float >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/PublicContent.cs b/src/Lumina.Excel/GeneratedSheets/PublicContent.cs index d0011e12..d25bd49d 100644 --- a/src/Lumina.Excel/GeneratedSheets/PublicContent.cs +++ b/src/Lumina.Excel/GeneratedSheets/PublicContent.cs @@ -7,44 +7,40 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "PublicContent", columnHash: 0xdb646081 )] - public class PublicContent : IExcelRow + public class PublicContent : ExcelRow { - public byte Type; - public ushort TimeLimit; - public uint MapIcon; - public SeString Name; - public LazyRow< PublicContentTextData > TextDataStart; - public LazyRow< PublicContentTextData > TextDataEnd; - public ushort Unknown6; - public uint Unknown7; - public uint Unknown8; - public LazyRow< ContentFinderCondition > ContentFinderCondition; - public ushort AdditionalData; - public byte Unknown11; - public ushort Unknown12; - public int Unknown540; - public ushort Unknown541; - public ushort Unknown542; + public byte Type { get; set; } + public ushort TimeLimit { get; set; } + public uint MapIcon { get; set; } + public SeString Name { get; set; } + public LazyRow< PublicContentTextData > TextDataStart { get; set; } + public LazyRow< PublicContentTextData > TextDataEnd { get; set; } + public ushort Unknown6 { get; set; } + public uint Unknown7 { get; set; } + public uint Unknown8 { get; set; } + public LazyRow< ContentFinderCondition > ContentFinderCondition { get; set; } + public ushort AdditionalData { get; set; } + public byte Unknown11 { get; set; } + public ushort Unknown12 { get; set; } + public int Unknown540 { get; set; } + public ushort Unknown541 { get; set; } + public ushort Unknown542 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Type = parser.ReadColumn< byte >( 0 ); TimeLimit = parser.ReadColumn< ushort >( 1 ); MapIcon = parser.ReadColumn< uint >( 2 ); Name = parser.ReadColumn< SeString >( 3 ); - TextDataStart = new LazyRow< PublicContentTextData >( lumina, parser.ReadColumn< uint >( 4 ), language ); - TextDataEnd = new LazyRow< PublicContentTextData >( lumina, parser.ReadColumn< uint >( 5 ), language ); + TextDataStart = new LazyRow< PublicContentTextData >( gameData, parser.ReadColumn< uint >( 4 ), language ); + TextDataEnd = new LazyRow< PublicContentTextData >( gameData, parser.ReadColumn< uint >( 5 ), language ); Unknown6 = parser.ReadColumn< ushort >( 6 ); Unknown7 = parser.ReadColumn< uint >( 7 ); Unknown8 = parser.ReadColumn< uint >( 8 ); - ContentFinderCondition = new LazyRow< ContentFinderCondition >( lumina, parser.ReadColumn< ushort >( 9 ), language ); + ContentFinderCondition = new LazyRow< ContentFinderCondition >( gameData, parser.ReadColumn< ushort >( 9 ), language ); AdditionalData = parser.ReadColumn< ushort >( 10 ); Unknown11 = parser.ReadColumn< byte >( 11 ); Unknown12 = parser.ReadColumn< ushort >( 12 ); diff --git a/src/Lumina.Excel/GeneratedSheets/PublicContentCutscene.cs b/src/Lumina.Excel/GeneratedSheets/PublicContentCutscene.cs index ee097438..56e0cc7d 100644 --- a/src/Lumina.Excel/GeneratedSheets/PublicContentCutscene.cs +++ b/src/Lumina.Excel/GeneratedSheets/PublicContentCutscene.cs @@ -7,22 +7,18 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "PublicContentCutscene", columnHash: 0x5d58cc84 )] - public class PublicContentCutscene : IExcelRow + public class PublicContentCutscene : ExcelRow { - public LazyRow< Cutscene > Cutscene; - public LazyRow< Cutscene > Cutscene2; + public LazyRow< Cutscene > Cutscene { get; set; } + public LazyRow< Cutscene > Cutscene2 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Cutscene = new LazyRow< Cutscene >( lumina, parser.ReadColumn< uint >( 0 ), language ); - Cutscene2 = new LazyRow< Cutscene >( lumina, parser.ReadColumn< uint >( 1 ), language ); + Cutscene = new LazyRow< Cutscene >( gameData, parser.ReadColumn< uint >( 0 ), language ); + Cutscene2 = new LazyRow< Cutscene >( gameData, parser.ReadColumn< uint >( 1 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/PublicContentTextData.cs b/src/Lumina.Excel/GeneratedSheets/PublicContentTextData.cs index 17c4eb15..7acdb8d3 100644 --- a/src/Lumina.Excel/GeneratedSheets/PublicContentTextData.cs +++ b/src/Lumina.Excel/GeneratedSheets/PublicContentTextData.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "PublicContentTextData", columnHash: 0xdebb20e3 )] - public class PublicContentTextData : IExcelRow + public class PublicContentTextData : ExcelRow { - public SeString TextData; + public SeString TextData { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); TextData = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/Purify.cs b/src/Lumina.Excel/GeneratedSheets/Purify.cs index 4d257843..8483689e 100644 --- a/src/Lumina.Excel/GeneratedSheets/Purify.cs +++ b/src/Lumina.Excel/GeneratedSheets/Purify.cs @@ -7,21 +7,17 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Purify", columnHash: 0xde74b4c4 )] - public class Purify : IExcelRow + public class Purify : ExcelRow { - public LazyRow< ClassJob > Class; - public byte Level; + public LazyRow< ClassJob > Class { get; set; } + public byte Level { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Class = new LazyRow< ClassJob >( lumina, parser.ReadColumn< byte >( 0 ), language ); + Class = new LazyRow< ClassJob >( gameData, parser.ReadColumn< byte >( 0 ), language ); Level = parser.ReadColumn< byte >( 1 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/PvPAction.cs b/src/Lumina.Excel/GeneratedSheets/PvPAction.cs index 2fd45d78..16260fe0 100644 --- a/src/Lumina.Excel/GeneratedSheets/PvPAction.cs +++ b/src/Lumina.Excel/GeneratedSheets/PvPAction.cs @@ -7,26 +7,22 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "PvPAction", columnHash: 0x3818ca1d )] - public class PvPAction : IExcelRow + public class PvPAction : ExcelRow { - public LazyRow< Action > Action; - public byte Unknown1; - public ushort Unknown2; - public ushort Unknown3; - public ushort Unknown4; - public bool[] GrandCompany; - public byte Unknown8; + public LazyRow< Action > Action { get; set; } + public byte Unknown1 { get; set; } + public ushort Unknown2 { get; set; } + public ushort Unknown3 { get; set; } + public ushort Unknown4 { get; set; } + public bool[] GrandCompany { get; set; } + public byte Unknown8 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Action = new LazyRow< Action >( lumina, parser.ReadColumn< ushort >( 0 ), language ); + Action = new LazyRow< Action >( gameData, parser.ReadColumn< ushort >( 0 ), language ); Unknown1 = parser.ReadColumn< byte >( 1 ); Unknown2 = parser.ReadColumn< ushort >( 2 ); Unknown3 = parser.ReadColumn< ushort >( 3 ); diff --git a/src/Lumina.Excel/GeneratedSheets/PvPActionSort.cs b/src/Lumina.Excel/GeneratedSheets/PvPActionSort.cs index 86fdfe1e..09743273 100644 --- a/src/Lumina.Excel/GeneratedSheets/PvPActionSort.cs +++ b/src/Lumina.Excel/GeneratedSheets/PvPActionSort.cs @@ -7,25 +7,21 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "PvPActionSort", columnHash: 0xc3af756b )] - public class PvPActionSort : IExcelRow + public class PvPActionSort : ExcelRow { - public byte Name; - public LazyRow< Action > Action; - public bool Unknown2; - public bool Unknown3; - public int Unknown4; + public byte Name { get; set; } + public LazyRow< Action > Action { get; set; } + public bool Unknown2 { get; set; } + public bool Unknown3 { get; set; } + public int Unknown4 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< byte >( 0 ); - Action = new LazyRow< Action >( lumina, parser.ReadColumn< ushort >( 1 ), language ); + Action = new LazyRow< Action >( gameData, parser.ReadColumn< ushort >( 1 ), language ); Unknown2 = parser.ReadColumn< bool >( 2 ); Unknown3 = parser.ReadColumn< bool >( 3 ); Unknown4 = parser.ReadColumn< int >( 4 ); diff --git a/src/Lumina.Excel/GeneratedSheets/PvPRank.cs b/src/Lumina.Excel/GeneratedSheets/PvPRank.cs index a66e1165..953b096c 100644 --- a/src/Lumina.Excel/GeneratedSheets/PvPRank.cs +++ b/src/Lumina.Excel/GeneratedSheets/PvPRank.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "PvPRank", columnHash: 0xdbf43666 )] - public class PvPRank : IExcelRow + public class PvPRank : ExcelRow { - public uint ExpRequired; + public uint ExpRequired { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); ExpRequired = parser.ReadColumn< uint >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/PvPSelectTrait.cs b/src/Lumina.Excel/GeneratedSheets/PvPSelectTrait.cs index b00ee11f..33f74a2c 100644 --- a/src/Lumina.Excel/GeneratedSheets/PvPSelectTrait.cs +++ b/src/Lumina.Excel/GeneratedSheets/PvPSelectTrait.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "PvPSelectTrait", columnHash: 0xbddf8130 )] - public class PvPSelectTrait : IExcelRow + public class PvPSelectTrait : ExcelRow { - public SeString Effect; - public uint Icon; - public short Value; + public SeString Effect { get; set; } + public uint Icon { get; set; } + public short Value { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Effect = parser.ReadColumn< SeString >( 0 ); Icon = parser.ReadColumn< uint >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/PvPTrait.cs b/src/Lumina.Excel/GeneratedSheets/PvPTrait.cs index e44e57af..0f7844d8 100644 --- a/src/Lumina.Excel/GeneratedSheets/PvPTrait.cs +++ b/src/Lumina.Excel/GeneratedSheets/PvPTrait.cs @@ -7,24 +7,20 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "PvPTrait", columnHash: 0xdc23efe7 )] - public class PvPTrait : IExcelRow + public class PvPTrait : ExcelRow { - public LazyRow< Trait > Trait1; - public LazyRow< Trait > Trait2; - public LazyRow< Trait > Trait3; + public LazyRow< Trait > Trait1 { get; set; } + public LazyRow< Trait > Trait2 { get; set; } + public LazyRow< Trait > Trait3 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Trait1 = new LazyRow< Trait >( lumina, parser.ReadColumn< ushort >( 0 ), language ); - Trait2 = new LazyRow< Trait >( lumina, parser.ReadColumn< ushort >( 1 ), language ); - Trait3 = new LazyRow< Trait >( lumina, parser.ReadColumn< ushort >( 2 ), language ); + Trait1 = new LazyRow< Trait >( gameData, parser.ReadColumn< ushort >( 0 ), language ); + Trait2 = new LazyRow< Trait >( gameData, parser.ReadColumn< ushort >( 1 ), language ); + Trait3 = new LazyRow< Trait >( gameData, parser.ReadColumn< ushort >( 2 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/Quest.cs b/src/Lumina.Excel/GeneratedSheets/Quest.cs index 8aad66fb..833f8214 100644 --- a/src/Lumina.Excel/GeneratedSheets/Quest.cs +++ b/src/Lumina.Excel/GeneratedSheets/Quest.cs @@ -7,341 +7,337 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Quest", columnHash: 0x3ca4d6c2 )] - public class Quest : IExcelRow + public class Quest : ExcelRow { - public SeString Name; - public SeString Id; - public LazyRow< ExVersion > Expansion; - public LazyRow< ClassJobCategory > ClassJobCategory0; - public ushort ClassJobLevel0; - public byte QuestLevelOffset; - public LazyRow< ClassJobCategory > ClassJobCategory1; - public ushort ClassJobLevel1; - public byte PreviousQuestJoin; - public LazyRow< Quest > PreviousQuest0; - public byte Unknown10; - public LazyRow< Quest > PreviousQuest1; - public LazyRow< Quest > PreviousQuest2; - public byte QuestLockJoin; - public LazyRow< Quest >[] QuestLock; - public ushort Header; - public byte Unknown17; - public byte Unknown18; - public LazyRow< ClassJob > ClassJobUnlock; - public LazyRow< GrandCompany > GrandCompany; - public LazyRow< GrandCompanyRank > GrandCompanyRank; - public byte InstanceContentJoin; - public LazyRow< InstanceContent >[] InstanceContent; - public LazyRow< Festival > Festival; - public byte FestivalBegin; - public byte FestivalEnd; - public ushort BellStart; - public ushort BellEnd; - public LazyRow< BeastTribe > BeastTribe; - public LazyRow< BeastReputationRank > BeastReputationRank; - public ushort BeastReputationValue; - public byte Unknown34; - public byte Unknown35; - public LazyRow< Mount > MountRequired; - public bool IsHouseRequired; - public LazyRow< DeliveryQuest > DeliveryQuest; - public uint IssuerStart; - public LazyRow< Level > IssuerLocation; - public LazyRow< Behavior > ClientBehavior; - public uint TargetEnd; - public bool IsRepeatable; - public byte RepeatIntervalType; - public LazyRow< QuestRepeatFlag > QuestRepeatFlag; - public bool CanCancel; - public byte Type; - public LazyRow< QuestClassJobSupply > QuestClassJobSupply; - public SeString[] ScriptInstruction; - public uint[] ScriptArg; - public byte[] ActorSpawnSeq; - public byte[] ActorDespawnSeq; - public uint[] Listener; - public byte[] QuestUInt8A; - public byte[] QuestUInt8B; - public byte[] ConditionType; - public uint[] ConditionValue; - public byte[] ConditionOperator; - public ushort[] Behavior; - public bool[] VisibleBool; - public bool[] ConditionBool; - public bool[] ItemBool; - public bool[] AnnounceBool; - public bool[] BehaviorBool; - public bool[] AcceptBool; - public bool[] QualifiedBool; - public bool[] CanTargetBool; - public byte[] ToDoCompleteSeq; - public byte[] ToDoQty; - public LazyRow< Level >[] ToDoMainLocation; - public uint[] Unknown1245; - public uint Unknown1252; - public uint Unknown1253; - public uint Unknown1254; - public uint Unknown1255; - public uint Unknown1256; - public uint Unknown1257; - public uint Unknown1258; - public uint Unknown1259; - public uint Unknown1260; - public uint Unknown1261; - public uint Unknown1262; - public uint Unknown1263; - public uint Unknown1264; - public uint Unknown1265; - public uint Unknown1266; - public uint Unknown1267; - public uint Unknown1268; - public uint Unknown1269; - public uint Unknown1270; - public uint Unknown1271; - public uint Unknown1272; - public uint Unknown1273; - public uint Unknown1274; - public uint Unknown1275; - public uint Unknown1276; - public uint Unknown1277; - public uint Unknown1278; - public uint Unknown1279; - public uint Unknown1280; - public uint Unknown1281; - public uint Unknown1282; - public uint Unknown1283; - public uint Unknown1284; - public uint Unknown1285; - public uint Unknown1286; - public uint Unknown1287; - public uint Unknown1288; - public uint Unknown1289; - public uint Unknown1290; - public uint Unknown1291; - public uint Unknown1292; - public uint Unknown1293; - public uint Unknown1294; - public uint Unknown1295; - public uint Unknown1296; - public uint Unknown1297; - public uint Unknown1298; - public uint Unknown1299; - public uint Unknown1300; - public uint Unknown1301; - public uint Unknown1302; - public uint Unknown1303; - public uint Unknown1304; - public uint Unknown1305; - public uint Unknown1306; - public uint Unknown1307; - public uint Unknown1308; - public uint Unknown1309; - public uint Unknown1310; - public uint Unknown1311; - public uint Unknown1312; - public uint Unknown1313; - public uint Unknown1314; - public uint Unknown1315; - public uint Unknown1316; - public uint Unknown1317; - public uint Unknown1318; - public uint Unknown1319; - public uint Unknown1320; - public uint Unknown1321; - public uint Unknown1322; - public uint Unknown1323; - public uint Unknown1324; - public uint Unknown1325; - public uint Unknown1326; - public uint Unknown1327; - public uint Unknown1328; - public uint Unknown1329; - public uint Unknown1330; - public uint Unknown1331; - public uint Unknown1332; - public uint Unknown1333; - public uint Unknown1334; - public uint Unknown1335; - public uint Unknown1336; - public uint Unknown1337; - public uint Unknown1338; - public uint Unknown1339; - public uint Unknown1340; - public uint Unknown1341; - public uint Unknown1342; - public uint Unknown1343; - public uint Unknown1344; - public uint Unknown1345; - public uint Unknown1346; - public uint Unknown1347; - public uint Unknown1348; - public uint Unknown1349; - public uint Unknown1350; - public uint Unknown1351; - public uint Unknown1352; - public uint Unknown1353; - public uint Unknown1354; - public uint Unknown1355; - public uint Unknown1356; - public uint Unknown1357; - public uint Unknown1358; - public uint Unknown1359; - public uint Unknown1360; - public uint Unknown1361; - public uint Unknown1362; - public uint Unknown1363; - public uint Unknown1364; - public uint Unknown1365; - public uint Unknown1366; - public uint Unknown1367; - public uint Unknown1368; - public uint Unknown1369; - public uint Unknown1370; - public uint Unknown1371; - public uint Unknown1372; - public uint Unknown1373; - public uint Unknown1374; - public uint Unknown1375; - public uint Unknown1376; - public uint Unknown1377; - public uint Unknown1378; - public uint Unknown1379; - public uint Unknown1380; - public uint Unknown1381; - public uint Unknown1382; - public uint Unknown1383; - public uint Unknown1384; - public uint Unknown1385; - public uint Unknown1386; - public uint Unknown1387; - public uint Unknown1388; - public uint Unknown1389; - public uint Unknown1390; - public uint Unknown1391; - public uint Unknown1392; - public uint Unknown1393; - public uint Unknown1394; - public uint Unknown1395; - public uint Unknown1396; - public uint Unknown1397; - public uint Unknown1398; - public uint Unknown1399; - public uint Unknown1400; - public uint Unknown1401; - public uint Unknown1402; - public uint Unknown1403; - public uint Unknown1404; - public uint Unknown1405; - public uint Unknown1406; - public uint Unknown1407; - public uint Unknown1408; - public uint Unknown1409; - public uint Unknown1410; - public uint Unknown1411; - public uint Unknown1412; - public byte[] CountableNum; - public byte LevelMax; - public LazyRow< ClassJob > ClassJobRequired; - public byte Unknown1439; - public ushort ExpFactor; - public uint GilReward; - public uint Unknown1442; - public ushort GCSeals; - public LazyRow< Item >[] ItemCatalyst; - public byte[] ItemCountCatalyst; - public byte ItemRewardType; - public uint[] ItemReward0; - public byte[] ItemCountReward0; - public byte Unknown1464; - public LazyRow< Stain >[] StainReward0; - public byte Unknown1471; - public LazyRow< Item >[] ItemReward1; - public byte[] ItemCountReward1; - public bool[] IsHQReward1; - public LazyRow< Stain >[] StainReward1; - public LazyRow< Emote > EmoteReward; - public LazyRow< Action > ActionReward; - public LazyRow< GeneralAction >[] GeneralActionReward; - public LazyRow< Action > SystemReward0; - public LazyRow< QuestRewardOther > OtherReward; - public LazyRow< Action > SystemReward1; - public LazyRow< Action > GCTypeReward; - public LazyRow< InstanceContent > InstanceContentUnlock; - public byte Unknown1501; - public byte TomestoneReward; - public byte TomestoneCountReward; - public byte ReputationReward; - public LazyRow< PlaceName > PlaceName; - public LazyRow< JournalGenre > JournalGenre; - public byte Unknown1507; - public uint Icon; - public uint IconSpecial; - public bool Introduction; - public bool HideOfferIcon; - public LazyRow< EventIconType > EventIconType; - public byte Unknown1513; - public ushort SortKey; - public bool Unknown54; + public SeString Name { get; set; } + public SeString Id { get; set; } + public LazyRow< ExVersion > Expansion { get; set; } + public LazyRow< ClassJobCategory > ClassJobCategory0 { get; set; } + public ushort ClassJobLevel0 { get; set; } + public byte QuestLevelOffset { get; set; } + public LazyRow< ClassJobCategory > ClassJobCategory1 { get; set; } + public ushort ClassJobLevel1 { get; set; } + public byte PreviousQuestJoin { get; set; } + public LazyRow< Quest > PreviousQuest0 { get; set; } + public byte Unknown10 { get; set; } + public LazyRow< Quest > PreviousQuest1 { get; set; } + public LazyRow< Quest > PreviousQuest2 { get; set; } + public byte QuestLockJoin { get; set; } + public LazyRow< Quest >[] QuestLock { get; set; } + public ushort Header { get; set; } + public byte Unknown17 { get; set; } + public byte Unknown18 { get; set; } + public LazyRow< ClassJob > ClassJobUnlock { get; set; } + public LazyRow< GrandCompany > GrandCompany { get; set; } + public LazyRow< GrandCompanyRank > GrandCompanyRank { get; set; } + public byte InstanceContentJoin { get; set; } + public LazyRow< InstanceContent >[] InstanceContent { get; set; } + public LazyRow< Festival > Festival { get; set; } + public byte FestivalBegin { get; set; } + public byte FestivalEnd { get; set; } + public ushort BellStart { get; set; } + public ushort BellEnd { get; set; } + public LazyRow< BeastTribe > BeastTribe { get; set; } + public LazyRow< BeastReputationRank > BeastReputationRank { get; set; } + public ushort BeastReputationValue { get; set; } + public byte Unknown34 { get; set; } + public byte Unknown35 { get; set; } + public LazyRow< Mount > MountRequired { get; set; } + public bool IsHouseRequired { get; set; } + public LazyRow< DeliveryQuest > DeliveryQuest { get; set; } + public uint IssuerStart { get; set; } + public LazyRow< Level > IssuerLocation { get; set; } + public LazyRow< Behavior > ClientBehavior { get; set; } + public uint TargetEnd { get; set; } + public bool IsRepeatable { get; set; } + public byte RepeatIntervalType { get; set; } + public LazyRow< QuestRepeatFlag > QuestRepeatFlag { get; set; } + public bool CanCancel { get; set; } + public byte Type { get; set; } + public LazyRow< QuestClassJobSupply > QuestClassJobSupply { get; set; } + public SeString[] ScriptInstruction { get; set; } + public uint[] ScriptArg { get; set; } + public byte[] ActorSpawnSeq { get; set; } + public byte[] ActorDespawnSeq { get; set; } + public uint[] Listener { get; set; } + public byte[] QuestUInt8A { get; set; } + public byte[] QuestUInt8B { get; set; } + public byte[] ConditionType { get; set; } + public uint[] ConditionValue { get; set; } + public byte[] ConditionOperator { get; set; } + public ushort[] Behavior { get; set; } + public bool[] VisibleBool { get; set; } + public bool[] ConditionBool { get; set; } + public bool[] ItemBool { get; set; } + public bool[] AnnounceBool { get; set; } + public bool[] BehaviorBool { get; set; } + public bool[] AcceptBool { get; set; } + public bool[] QualifiedBool { get; set; } + public bool[] CanTargetBool { get; set; } + public byte[] ToDoCompleteSeq { get; set; } + public byte[] ToDoQty { get; set; } + public LazyRow< Level >[] ToDoMainLocation { get; set; } + public uint[] Unknown1245 { get; set; } + public uint Unknown1252 { get; set; } + public uint Unknown1253 { get; set; } + public uint Unknown1254 { get; set; } + public uint Unknown1255 { get; set; } + public uint Unknown1256 { get; set; } + public uint Unknown1257 { get; set; } + public uint Unknown1258 { get; set; } + public uint Unknown1259 { get; set; } + public uint Unknown1260 { get; set; } + public uint Unknown1261 { get; set; } + public uint Unknown1262 { get; set; } + public uint Unknown1263 { get; set; } + public uint Unknown1264 { get; set; } + public uint Unknown1265 { get; set; } + public uint Unknown1266 { get; set; } + public uint Unknown1267 { get; set; } + public uint Unknown1268 { get; set; } + public uint Unknown1269 { get; set; } + public uint Unknown1270 { get; set; } + public uint Unknown1271 { get; set; } + public uint Unknown1272 { get; set; } + public uint Unknown1273 { get; set; } + public uint Unknown1274 { get; set; } + public uint Unknown1275 { get; set; } + public uint Unknown1276 { get; set; } + public uint Unknown1277 { get; set; } + public uint Unknown1278 { get; set; } + public uint Unknown1279 { get; set; } + public uint Unknown1280 { get; set; } + public uint Unknown1281 { get; set; } + public uint Unknown1282 { get; set; } + public uint Unknown1283 { get; set; } + public uint Unknown1284 { get; set; } + public uint Unknown1285 { get; set; } + public uint Unknown1286 { get; set; } + public uint Unknown1287 { get; set; } + public uint Unknown1288 { get; set; } + public uint Unknown1289 { get; set; } + public uint Unknown1290 { get; set; } + public uint Unknown1291 { get; set; } + public uint Unknown1292 { get; set; } + public uint Unknown1293 { get; set; } + public uint Unknown1294 { get; set; } + public uint Unknown1295 { get; set; } + public uint Unknown1296 { get; set; } + public uint Unknown1297 { get; set; } + public uint Unknown1298 { get; set; } + public uint Unknown1299 { get; set; } + public uint Unknown1300 { get; set; } + public uint Unknown1301 { get; set; } + public uint Unknown1302 { get; set; } + public uint Unknown1303 { get; set; } + public uint Unknown1304 { get; set; } + public uint Unknown1305 { get; set; } + public uint Unknown1306 { get; set; } + public uint Unknown1307 { get; set; } + public uint Unknown1308 { get; set; } + public uint Unknown1309 { get; set; } + public uint Unknown1310 { get; set; } + public uint Unknown1311 { get; set; } + public uint Unknown1312 { get; set; } + public uint Unknown1313 { get; set; } + public uint Unknown1314 { get; set; } + public uint Unknown1315 { get; set; } + public uint Unknown1316 { get; set; } + public uint Unknown1317 { get; set; } + public uint Unknown1318 { get; set; } + public uint Unknown1319 { get; set; } + public uint Unknown1320 { get; set; } + public uint Unknown1321 { get; set; } + public uint Unknown1322 { get; set; } + public uint Unknown1323 { get; set; } + public uint Unknown1324 { get; set; } + public uint Unknown1325 { get; set; } + public uint Unknown1326 { get; set; } + public uint Unknown1327 { get; set; } + public uint Unknown1328 { get; set; } + public uint Unknown1329 { get; set; } + public uint Unknown1330 { get; set; } + public uint Unknown1331 { get; set; } + public uint Unknown1332 { get; set; } + public uint Unknown1333 { get; set; } + public uint Unknown1334 { get; set; } + public uint Unknown1335 { get; set; } + public uint Unknown1336 { get; set; } + public uint Unknown1337 { get; set; } + public uint Unknown1338 { get; set; } + public uint Unknown1339 { get; set; } + public uint Unknown1340 { get; set; } + public uint Unknown1341 { get; set; } + public uint Unknown1342 { get; set; } + public uint Unknown1343 { get; set; } + public uint Unknown1344 { get; set; } + public uint Unknown1345 { get; set; } + public uint Unknown1346 { get; set; } + public uint Unknown1347 { get; set; } + public uint Unknown1348 { get; set; } + public uint Unknown1349 { get; set; } + public uint Unknown1350 { get; set; } + public uint Unknown1351 { get; set; } + public uint Unknown1352 { get; set; } + public uint Unknown1353 { get; set; } + public uint Unknown1354 { get; set; } + public uint Unknown1355 { get; set; } + public uint Unknown1356 { get; set; } + public uint Unknown1357 { get; set; } + public uint Unknown1358 { get; set; } + public uint Unknown1359 { get; set; } + public uint Unknown1360 { get; set; } + public uint Unknown1361 { get; set; } + public uint Unknown1362 { get; set; } + public uint Unknown1363 { get; set; } + public uint Unknown1364 { get; set; } + public uint Unknown1365 { get; set; } + public uint Unknown1366 { get; set; } + public uint Unknown1367 { get; set; } + public uint Unknown1368 { get; set; } + public uint Unknown1369 { get; set; } + public uint Unknown1370 { get; set; } + public uint Unknown1371 { get; set; } + public uint Unknown1372 { get; set; } + public uint Unknown1373 { get; set; } + public uint Unknown1374 { get; set; } + public uint Unknown1375 { get; set; } + public uint Unknown1376 { get; set; } + public uint Unknown1377 { get; set; } + public uint Unknown1378 { get; set; } + public uint Unknown1379 { get; set; } + public uint Unknown1380 { get; set; } + public uint Unknown1381 { get; set; } + public uint Unknown1382 { get; set; } + public uint Unknown1383 { get; set; } + public uint Unknown1384 { get; set; } + public uint Unknown1385 { get; set; } + public uint Unknown1386 { get; set; } + public uint Unknown1387 { get; set; } + public uint Unknown1388 { get; set; } + public uint Unknown1389 { get; set; } + public uint Unknown1390 { get; set; } + public uint Unknown1391 { get; set; } + public uint Unknown1392 { get; set; } + public uint Unknown1393 { get; set; } + public uint Unknown1394 { get; set; } + public uint Unknown1395 { get; set; } + public uint Unknown1396 { get; set; } + public uint Unknown1397 { get; set; } + public uint Unknown1398 { get; set; } + public uint Unknown1399 { get; set; } + public uint Unknown1400 { get; set; } + public uint Unknown1401 { get; set; } + public uint Unknown1402 { get; set; } + public uint Unknown1403 { get; set; } + public uint Unknown1404 { get; set; } + public uint Unknown1405 { get; set; } + public uint Unknown1406 { get; set; } + public uint Unknown1407 { get; set; } + public uint Unknown1408 { get; set; } + public uint Unknown1409 { get; set; } + public uint Unknown1410 { get; set; } + public uint Unknown1411 { get; set; } + public uint Unknown1412 { get; set; } + public byte[] CountableNum { get; set; } + public byte LevelMax { get; set; } + public LazyRow< ClassJob > ClassJobRequired { get; set; } + public byte Unknown1439 { get; set; } + public ushort ExpFactor { get; set; } + public uint GilReward { get; set; } + public uint Unknown1442 { get; set; } + public ushort GCSeals { get; set; } + public LazyRow< Item >[] ItemCatalyst { get; set; } + public byte[] ItemCountCatalyst { get; set; } + public byte ItemRewardType { get; set; } + public uint[] ItemReward0 { get; set; } + public byte[] ItemCountReward0 { get; set; } + public byte Unknown1464 { get; set; } + public LazyRow< Stain >[] StainReward0 { get; set; } + public byte Unknown1471 { get; set; } + public LazyRow< Item >[] ItemReward1 { get; set; } + public byte[] ItemCountReward1 { get; set; } + public bool[] IsHQReward1 { get; set; } + public LazyRow< Stain >[] StainReward1 { get; set; } + public LazyRow< Emote > EmoteReward { get; set; } + public LazyRow< Action > ActionReward { get; set; } + public LazyRow< GeneralAction >[] GeneralActionReward { get; set; } + public LazyRow< Action > SystemReward0 { get; set; } + public LazyRow< QuestRewardOther > OtherReward { get; set; } + public LazyRow< Action > SystemReward1 { get; set; } + public LazyRow< Action > GCTypeReward { get; set; } + public LazyRow< InstanceContent > InstanceContentUnlock { get; set; } + public byte Unknown1501 { get; set; } + public byte TomestoneReward { get; set; } + public byte TomestoneCountReward { get; set; } + public byte ReputationReward { get; set; } + public LazyRow< PlaceName > PlaceName { get; set; } + public LazyRow< JournalGenre > JournalGenre { get; set; } + public byte Unknown1507 { get; set; } + public uint Icon { get; set; } + public uint IconSpecial { get; set; } + public bool Introduction { get; set; } + public bool HideOfferIcon { get; set; } + public LazyRow< EventIconType > EventIconType { get; set; } + public byte Unknown1513 { get; set; } + public ushort SortKey { get; set; } + public bool Unknown54 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); Id = parser.ReadColumn< SeString >( 1 ); - Expansion = new LazyRow< ExVersion >( lumina, parser.ReadColumn< byte >( 2 ), language ); - ClassJobCategory0 = new LazyRow< ClassJobCategory >( lumina, parser.ReadColumn< byte >( 3 ), language ); + Expansion = new LazyRow< ExVersion >( gameData, parser.ReadColumn< byte >( 2 ), language ); + ClassJobCategory0 = new LazyRow< ClassJobCategory >( gameData, parser.ReadColumn< byte >( 3 ), language ); ClassJobLevel0 = parser.ReadColumn< ushort >( 4 ); QuestLevelOffset = parser.ReadColumn< byte >( 5 ); - ClassJobCategory1 = new LazyRow< ClassJobCategory >( lumina, parser.ReadColumn< byte >( 6 ), language ); + ClassJobCategory1 = new LazyRow< ClassJobCategory >( gameData, parser.ReadColumn< byte >( 6 ), language ); ClassJobLevel1 = parser.ReadColumn< ushort >( 7 ); PreviousQuestJoin = parser.ReadColumn< byte >( 8 ); - PreviousQuest0 = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 9 ), language ); + PreviousQuest0 = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 9 ), language ); Unknown10 = parser.ReadColumn< byte >( 10 ); - PreviousQuest1 = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 11 ), language ); - PreviousQuest2 = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 12 ), language ); + PreviousQuest1 = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 11 ), language ); + PreviousQuest2 = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 12 ), language ); QuestLockJoin = parser.ReadColumn< byte >( 13 ); QuestLock = new LazyRow< Quest >[ 2 ]; for( var i = 0; i < 2; i++ ) - QuestLock[ i ] = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 14 + i ), language ); + QuestLock[ i ] = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 14 + i ), language ); Header = parser.ReadColumn< ushort >( 16 ); Unknown17 = parser.ReadColumn< byte >( 17 ); Unknown18 = parser.ReadColumn< byte >( 18 ); - ClassJobUnlock = new LazyRow< ClassJob >( lumina, parser.ReadColumn< byte >( 19 ), language ); - GrandCompany = new LazyRow< GrandCompany >( lumina, parser.ReadColumn< byte >( 20 ), language ); - GrandCompanyRank = new LazyRow< GrandCompanyRank >( lumina, parser.ReadColumn< byte >( 21 ), language ); + ClassJobUnlock = new LazyRow< ClassJob >( gameData, parser.ReadColumn< byte >( 19 ), language ); + GrandCompany = new LazyRow< GrandCompany >( gameData, parser.ReadColumn< byte >( 20 ), language ); + GrandCompanyRank = new LazyRow< GrandCompanyRank >( gameData, parser.ReadColumn< byte >( 21 ), language ); InstanceContentJoin = parser.ReadColumn< byte >( 22 ); InstanceContent = new LazyRow< InstanceContent >[ 3 ]; for( var i = 0; i < 3; i++ ) - InstanceContent[ i ] = new LazyRow< InstanceContent >( lumina, parser.ReadColumn< uint >( 23 + i ), language ); - Festival = new LazyRow< Festival >( lumina, parser.ReadColumn< byte >( 26 ), language ); + InstanceContent[ i ] = new LazyRow< InstanceContent >( gameData, parser.ReadColumn< uint >( 23 + i ), language ); + Festival = new LazyRow< Festival >( gameData, parser.ReadColumn< byte >( 26 ), language ); FestivalBegin = parser.ReadColumn< byte >( 27 ); FestivalEnd = parser.ReadColumn< byte >( 28 ); BellStart = parser.ReadColumn< ushort >( 29 ); BellEnd = parser.ReadColumn< ushort >( 30 ); - BeastTribe = new LazyRow< BeastTribe >( lumina, parser.ReadColumn< byte >( 31 ), language ); - BeastReputationRank = new LazyRow< BeastReputationRank >( lumina, parser.ReadColumn< byte >( 32 ), language ); + BeastTribe = new LazyRow< BeastTribe >( gameData, parser.ReadColumn< byte >( 31 ), language ); + BeastReputationRank = new LazyRow< BeastReputationRank >( gameData, parser.ReadColumn< byte >( 32 ), language ); BeastReputationValue = parser.ReadColumn< ushort >( 33 ); Unknown34 = parser.ReadColumn< byte >( 34 ); Unknown35 = parser.ReadColumn< byte >( 35 ); - MountRequired = new LazyRow< Mount >( lumina, parser.ReadColumn< int >( 36 ), language ); + MountRequired = new LazyRow< Mount >( gameData, parser.ReadColumn< int >( 36 ), language ); IsHouseRequired = parser.ReadColumn< bool >( 37 ); - DeliveryQuest = new LazyRow< DeliveryQuest >( lumina, parser.ReadColumn< byte >( 38 ), language ); + DeliveryQuest = new LazyRow< DeliveryQuest >( gameData, parser.ReadColumn< byte >( 38 ), language ); IssuerStart = parser.ReadColumn< uint >( 39 ); - IssuerLocation = new LazyRow< Level >( lumina, parser.ReadColumn< uint >( 40 ), language ); - ClientBehavior = new LazyRow< Behavior >( lumina, parser.ReadColumn< ushort >( 41 ), language ); + IssuerLocation = new LazyRow< Level >( gameData, parser.ReadColumn< uint >( 40 ), language ); + ClientBehavior = new LazyRow< Behavior >( gameData, parser.ReadColumn< ushort >( 41 ), language ); TargetEnd = parser.ReadColumn< uint >( 42 ); IsRepeatable = parser.ReadColumn< bool >( 43 ); RepeatIntervalType = parser.ReadColumn< byte >( 44 ); - QuestRepeatFlag = new LazyRow< QuestRepeatFlag >( lumina, parser.ReadColumn< byte >( 45 ), language ); + QuestRepeatFlag = new LazyRow< QuestRepeatFlag >( gameData, parser.ReadColumn< byte >( 45 ), language ); CanCancel = parser.ReadColumn< bool >( 46 ); Type = parser.ReadColumn< byte >( 47 ); - QuestClassJobSupply = new LazyRow< QuestClassJobSupply >( lumina, parser.ReadColumn< ushort >( 48 ), language ); + QuestClassJobSupply = new LazyRow< QuestClassJobSupply >( gameData, parser.ReadColumn< ushort >( 48 ), language ); ScriptInstruction = new SeString[ 50 ]; for( var i = 0; i < 50; i++ ) ScriptInstruction[ i ] = parser.ReadColumn< SeString >( 49 + i ); @@ -407,7 +403,7 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) ToDoQty[ i ] = parser.ReadColumn< byte >( 1197 + i ); ToDoMainLocation = new LazyRow< Level >[ 24 ]; for( var i = 0; i < 24; i++ ) - ToDoMainLocation[ i ] = new LazyRow< Level >( lumina, parser.ReadColumn< uint >( 1221 + i ), language ); + ToDoMainLocation[ i ] = new LazyRow< Level >( gameData, parser.ReadColumn< uint >( 1221 + i ), language ); Unknown1245 = new uint[ 7 ]; for( var i = 0; i < 7; i++ ) Unknown1245[ i ] = parser.ReadColumn< uint >( 1245 + i ); @@ -576,7 +572,7 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) for( var i = 0; i < 24; i++ ) CountableNum[ i ] = parser.ReadColumn< byte >( 1413 + i ); LevelMax = parser.ReadColumn< byte >( 1437 ); - ClassJobRequired = new LazyRow< ClassJob >( lumina, parser.ReadColumn< byte >( 1438 ), language ); + ClassJobRequired = new LazyRow< ClassJob >( gameData, parser.ReadColumn< byte >( 1438 ), language ); Unknown1439 = parser.ReadColumn< byte >( 1439 ); ExpFactor = parser.ReadColumn< ushort >( 1440 ); GilReward = parser.ReadColumn< uint >( 1441 ); @@ -584,7 +580,7 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) GCSeals = parser.ReadColumn< ushort >( 1443 ); ItemCatalyst = new LazyRow< Item >[ 3 ]; for( var i = 0; i < 3; i++ ) - ItemCatalyst[ i ] = new LazyRow< Item >( lumina, parser.ReadColumn< byte >( 1444 + i ), language ); + ItemCatalyst[ i ] = new LazyRow< Item >( gameData, parser.ReadColumn< byte >( 1444 + i ), language ); ItemCountCatalyst = new byte[ 3 ]; for( var i = 0; i < 3; i++ ) ItemCountCatalyst[ i ] = parser.ReadColumn< byte >( 1447 + i ); @@ -598,11 +594,11 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) Unknown1464 = parser.ReadColumn< byte >( 1464 ); StainReward0 = new LazyRow< Stain >[ 6 ]; for( var i = 0; i < 6; i++ ) - StainReward0[ i ] = new LazyRow< Stain >( lumina, parser.ReadColumn< byte >( 1465 + i ), language ); + StainReward0[ i ] = new LazyRow< Stain >( gameData, parser.ReadColumn< byte >( 1465 + i ), language ); Unknown1471 = parser.ReadColumn< byte >( 1471 ); ItemReward1 = new LazyRow< Item >[ 5 ]; for( var i = 0; i < 5; i++ ) - ItemReward1[ i ] = new LazyRow< Item >( lumina, parser.ReadColumn< uint >( 1472 + i ), language ); + ItemReward1[ i ] = new LazyRow< Item >( gameData, parser.ReadColumn< uint >( 1472 + i ), language ); ItemCountReward1 = new byte[ 5 ]; for( var i = 0; i < 5; i++ ) ItemCountReward1[ i ] = parser.ReadColumn< byte >( 1477 + i ); @@ -611,29 +607,29 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) IsHQReward1[ i ] = parser.ReadColumn< bool >( 1482 + i ); StainReward1 = new LazyRow< Stain >[ 5 ]; for( var i = 0; i < 5; i++ ) - StainReward1[ i ] = new LazyRow< Stain >( lumina, parser.ReadColumn< byte >( 1487 + i ), language ); - EmoteReward = new LazyRow< Emote >( lumina, parser.ReadColumn< byte >( 1492 ), language ); - ActionReward = new LazyRow< Action >( lumina, parser.ReadColumn< ushort >( 1493 ), language ); + StainReward1[ i ] = new LazyRow< Stain >( gameData, parser.ReadColumn< byte >( 1487 + i ), language ); + EmoteReward = new LazyRow< Emote >( gameData, parser.ReadColumn< byte >( 1492 ), language ); + ActionReward = new LazyRow< Action >( gameData, parser.ReadColumn< ushort >( 1493 ), language ); GeneralActionReward = new LazyRow< GeneralAction >[ 2 ]; for( var i = 0; i < 2; i++ ) - GeneralActionReward[ i ] = new LazyRow< GeneralAction >( lumina, parser.ReadColumn< byte >( 1494 + i ), language ); - SystemReward0 = new LazyRow< Action >( lumina, parser.ReadColumn< ushort >( 1496 ), language ); - OtherReward = new LazyRow< QuestRewardOther >( lumina, parser.ReadColumn< byte >( 1497 ), language ); - SystemReward1 = new LazyRow< Action >( lumina, parser.ReadColumn< ushort >( 1498 ), language ); - GCTypeReward = new LazyRow< Action >( lumina, parser.ReadColumn< ushort >( 1499 ), language ); - InstanceContentUnlock = new LazyRow< InstanceContent >( lumina, parser.ReadColumn< uint >( 1500 ), language ); + GeneralActionReward[ i ] = new LazyRow< GeneralAction >( gameData, parser.ReadColumn< byte >( 1494 + i ), language ); + SystemReward0 = new LazyRow< Action >( gameData, parser.ReadColumn< ushort >( 1496 ), language ); + OtherReward = new LazyRow< QuestRewardOther >( gameData, parser.ReadColumn< byte >( 1497 ), language ); + SystemReward1 = new LazyRow< Action >( gameData, parser.ReadColumn< ushort >( 1498 ), language ); + GCTypeReward = new LazyRow< Action >( gameData, parser.ReadColumn< ushort >( 1499 ), language ); + InstanceContentUnlock = new LazyRow< InstanceContent >( gameData, parser.ReadColumn< uint >( 1500 ), language ); Unknown1501 = parser.ReadColumn< byte >( 1501 ); TomestoneReward = parser.ReadColumn< byte >( 1502 ); TomestoneCountReward = parser.ReadColumn< byte >( 1503 ); ReputationReward = parser.ReadColumn< byte >( 1504 ); - PlaceName = new LazyRow< PlaceName >( lumina, parser.ReadColumn< ushort >( 1505 ), language ); - JournalGenre = new LazyRow< JournalGenre >( lumina, parser.ReadColumn< byte >( 1506 ), language ); + PlaceName = new LazyRow< PlaceName >( gameData, parser.ReadColumn< ushort >( 1505 ), language ); + JournalGenre = new LazyRow< JournalGenre >( gameData, parser.ReadColumn< byte >( 1506 ), language ); Unknown1507 = parser.ReadColumn< byte >( 1507 ); Icon = parser.ReadColumn< uint >( 1508 ); IconSpecial = parser.ReadColumn< uint >( 1509 ); Introduction = parser.ReadColumn< bool >( 1510 ); HideOfferIcon = parser.ReadColumn< bool >( 1511 ); - EventIconType = new LazyRow< EventIconType >( lumina, parser.ReadColumn< byte >( 1512 ), language ); + EventIconType = new LazyRow< EventIconType >( gameData, parser.ReadColumn< byte >( 1512 ), language ); Unknown1513 = parser.ReadColumn< byte >( 1513 ); SortKey = parser.ReadColumn< ushort >( 1514 ); Unknown54 = parser.ReadColumn< bool >( 1515 ); diff --git a/src/Lumina.Excel/GeneratedSheets/QuestBattle.cs b/src/Lumina.Excel/GeneratedSheets/QuestBattle.cs index b4659182..f19b50c2 100644 --- a/src/Lumina.Excel/GeneratedSheets/QuestBattle.cs +++ b/src/Lumina.Excel/GeneratedSheets/QuestBattle.cs @@ -7,23 +7,19 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "QuestBattle", columnHash: 0xd46e8441 )] - public class QuestBattle : IExcelRow + public class QuestBattle : ExcelRow { - public int Quest; - public byte QuestBattleScene; - public ushort TimeLimit; - public ushort LevelSync; - public SeString[] ScriptInstruction; - public uint[] ScriptValue; + public int Quest { get; set; } + public byte QuestBattleScene { get; set; } + public ushort TimeLimit { get; set; } + public ushort LevelSync { get; set; } + public SeString[] ScriptInstruction { get; set; } + public uint[] ScriptValue { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Quest = parser.ReadColumn< int >( 0 ); QuestBattleScene = parser.ReadColumn< byte >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/QuestChapter.cs b/src/Lumina.Excel/GeneratedSheets/QuestChapter.cs index 1a53bb4d..572c47f4 100644 --- a/src/Lumina.Excel/GeneratedSheets/QuestChapter.cs +++ b/src/Lumina.Excel/GeneratedSheets/QuestChapter.cs @@ -7,21 +7,17 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "QuestChapter", columnHash: 0x5edc18ea )] - public class QuestChapter : IExcelRow + public class QuestChapter : ExcelRow { - public LazyRow< Quest > Quest; - public ushort Redo; + public LazyRow< Quest > Quest { get; set; } + public ushort Redo { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Quest = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 0 ), language ); + Quest = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 0 ), language ); Redo = parser.ReadColumn< ushort >( 1 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/QuestClassJobReward.cs b/src/Lumina.Excel/GeneratedSheets/QuestClassJobReward.cs index c068b7bf..fc2e0e06 100644 --- a/src/Lumina.Excel/GeneratedSheets/QuestClassJobReward.cs +++ b/src/Lumina.Excel/GeneratedSheets/QuestClassJobReward.cs @@ -7,41 +7,37 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "QuestClassJobReward", columnHash: 0x3d96093f )] - public class QuestClassJobReward : IExcelRow + public class QuestClassJobReward : ExcelRow { - public LazyRow< ClassJobCategory > ClassJobCategory; - public LazyRow< Item >[] RewardItem; - public byte[] RewardAmount; - public LazyRow< Item >[] RequiredItem; - public byte[] RequiredAmount; - public bool Unknown17; - public bool Unknown18; - public bool Unknown19; - public bool Unknown20; - public bool Unknown21; - public bool Unknown22; - public bool Unknown23; - public bool Unknown24; + public LazyRow< ClassJobCategory > ClassJobCategory { get; set; } + public LazyRow< Item >[] RewardItem { get; set; } + public byte[] RewardAmount { get; set; } + public LazyRow< Item >[] RequiredItem { get; set; } + public byte[] RequiredAmount { get; set; } + public bool Unknown17 { get; set; } + public bool Unknown18 { get; set; } + public bool Unknown19 { get; set; } + public bool Unknown20 { get; set; } + public bool Unknown21 { get; set; } + public bool Unknown22 { get; set; } + public bool Unknown23 { get; set; } + public bool Unknown24 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - ClassJobCategory = new LazyRow< ClassJobCategory >( lumina, parser.ReadColumn< byte >( 0 ), language ); + ClassJobCategory = new LazyRow< ClassJobCategory >( gameData, parser.ReadColumn< byte >( 0 ), language ); RewardItem = new LazyRow< Item >[ 4 ]; for( var i = 0; i < 4; i++ ) - RewardItem[ i ] = new LazyRow< Item >( lumina, parser.ReadColumn< uint >( 1 + i ), language ); + RewardItem[ i ] = new LazyRow< Item >( gameData, parser.ReadColumn< uint >( 1 + i ), language ); RewardAmount = new byte[ 4 ]; for( var i = 0; i < 4; i++ ) RewardAmount[ i ] = parser.ReadColumn< byte >( 5 + i ); RequiredItem = new LazyRow< Item >[ 4 ]; for( var i = 0; i < 4; i++ ) - RequiredItem[ i ] = new LazyRow< Item >( lumina, parser.ReadColumn< uint >( 9 + i ), language ); + RequiredItem[ i ] = new LazyRow< Item >( gameData, parser.ReadColumn< uint >( 9 + i ), language ); RequiredAmount = new byte[ 4 ]; for( var i = 0; i < 4; i++ ) RequiredAmount[ i ] = parser.ReadColumn< byte >( 13 + i ); diff --git a/src/Lumina.Excel/GeneratedSheets/QuestClassJobSupply.cs b/src/Lumina.Excel/GeneratedSheets/QuestClassJobSupply.cs index 4ae3d14c..9d10484f 100644 --- a/src/Lumina.Excel/GeneratedSheets/QuestClassJobSupply.cs +++ b/src/Lumina.Excel/GeneratedSheets/QuestClassJobSupply.cs @@ -7,28 +7,24 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "QuestClassJobSupply", columnHash: 0xdd620f3e )] - public class QuestClassJobSupply : IExcelRow + public class QuestClassJobSupply : ExcelRow { - public LazyRow< ClassJobCategory > ClassJobCategory; - public byte Unknown1; - public LazyRow< ENpcResident > ENpcResident; - public LazyRow< Item > Item; - public byte Unknown4; - public bool Unknown5; + public LazyRow< ClassJobCategory > ClassJobCategory { get; set; } + public byte Unknown1 { get; set; } + public LazyRow< ENpcResident > ENpcResident { get; set; } + public LazyRow< Item > Item { get; set; } + public byte Unknown4 { get; set; } + public bool Unknown5 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - ClassJobCategory = new LazyRow< ClassJobCategory >( lumina, parser.ReadColumn< byte >( 0 ), language ); + ClassJobCategory = new LazyRow< ClassJobCategory >( gameData, parser.ReadColumn< byte >( 0 ), language ); Unknown1 = parser.ReadColumn< byte >( 1 ); - ENpcResident = new LazyRow< ENpcResident >( lumina, parser.ReadColumn< uint >( 2 ), language ); - Item = new LazyRow< Item >( lumina, parser.ReadColumn< uint >( 3 ), language ); + ENpcResident = new LazyRow< ENpcResident >( gameData, parser.ReadColumn< uint >( 2 ), language ); + Item = new LazyRow< Item >( gameData, parser.ReadColumn< uint >( 3 ), language ); Unknown4 = parser.ReadColumn< byte >( 4 ); Unknown5 = parser.ReadColumn< bool >( 5 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/QuestDerivedClass.cs b/src/Lumina.Excel/GeneratedSheets/QuestDerivedClass.cs index 2c404a2b..055f4aea 100644 --- a/src/Lumina.Excel/GeneratedSheets/QuestDerivedClass.cs +++ b/src/Lumina.Excel/GeneratedSheets/QuestDerivedClass.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "QuestDerivedClass", columnHash: 0xdcfd9eba )] - public class QuestDerivedClass : IExcelRow + public class QuestDerivedClass : ExcelRow { - public LazyRow< ClassJob > ClassJob; + public LazyRow< ClassJob > ClassJob { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - ClassJob = new LazyRow< ClassJob >( lumina, parser.ReadColumn< byte >( 0 ), language ); + ClassJob = new LazyRow< ClassJob >( gameData, parser.ReadColumn< byte >( 0 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/QuestRedo.cs b/src/Lumina.Excel/GeneratedSheets/QuestRedo.cs index 0cd82122..74956f03 100644 --- a/src/Lumina.Excel/GeneratedSheets/QuestRedo.cs +++ b/src/Lumina.Excel/GeneratedSheets/QuestRedo.cs @@ -7,60 +7,56 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "QuestRedo", columnHash: 0xb199478e )] - public class QuestRedo : IExcelRow + public class QuestRedo : ExcelRow { - public LazyRow< Quest > FinalQuest; - public byte Unknown1; - public ushort Chapter; - public LazyRow< Quest >[] Quest; - public byte Unknown35; - public byte Unknown36; - public byte Unknown37; - public byte Unknown38; - public byte Unknown39; - public byte Unknown40; - public byte Unknown41; - public byte Unknown42; - public byte Unknown43; - public byte Unknown44; - public byte Unknown45; - public byte Unknown46; - public byte Unknown47; - public byte Unknown48; - public byte Unknown49; - public byte Unknown50; - public byte Unknown51; - public byte Unknown52; - public byte Unknown53; - public byte Unknown54; - public byte Unknown55; - public byte Unknown56; - public byte Unknown57; - public byte Unknown58; - public byte Unknown59; - public byte Unknown60; - public byte Unknown61; - public byte Unknown62; - public byte Unknown63; - public byte Unknown64; - public byte Unknown65; - public byte Unknown66; + public LazyRow< Quest > FinalQuest { get; set; } + public byte Unknown1 { get; set; } + public ushort Chapter { get; set; } + public LazyRow< Quest >[] Quest { get; set; } + public byte Unknown35 { get; set; } + public byte Unknown36 { get; set; } + public byte Unknown37 { get; set; } + public byte Unknown38 { get; set; } + public byte Unknown39 { get; set; } + public byte Unknown40 { get; set; } + public byte Unknown41 { get; set; } + public byte Unknown42 { get; set; } + public byte Unknown43 { get; set; } + public byte Unknown44 { get; set; } + public byte Unknown45 { get; set; } + public byte Unknown46 { get; set; } + public byte Unknown47 { get; set; } + public byte Unknown48 { get; set; } + public byte Unknown49 { get; set; } + public byte Unknown50 { get; set; } + public byte Unknown51 { get; set; } + public byte Unknown52 { get; set; } + public byte Unknown53 { get; set; } + public byte Unknown54 { get; set; } + public byte Unknown55 { get; set; } + public byte Unknown56 { get; set; } + public byte Unknown57 { get; set; } + public byte Unknown58 { get; set; } + public byte Unknown59 { get; set; } + public byte Unknown60 { get; set; } + public byte Unknown61 { get; set; } + public byte Unknown62 { get; set; } + public byte Unknown63 { get; set; } + public byte Unknown64 { get; set; } + public byte Unknown65 { get; set; } + public byte Unknown66 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - FinalQuest = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 0 ), language ); + FinalQuest = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 0 ), language ); Unknown1 = parser.ReadColumn< byte >( 1 ); Chapter = parser.ReadColumn< ushort >( 2 ); Quest = new LazyRow< Quest >[ 32 ]; for( var i = 0; i < 32; i++ ) - Quest[ i ] = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 3 + i ), language ); + Quest[ i ] = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 3 + i ), language ); Unknown35 = parser.ReadColumn< byte >( 35 ); Unknown36 = parser.ReadColumn< byte >( 36 ); Unknown37 = parser.ReadColumn< byte >( 37 ); diff --git a/src/Lumina.Excel/GeneratedSheets/QuestRedoChapterUI.cs b/src/Lumina.Excel/GeneratedSheets/QuestRedoChapterUI.cs index 158b6ce8..aaa00cef 100644 --- a/src/Lumina.Excel/GeneratedSheets/QuestRedoChapterUI.cs +++ b/src/Lumina.Excel/GeneratedSheets/QuestRedoChapterUI.cs @@ -7,31 +7,27 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "QuestRedoChapterUI", columnHash: 0x4d7d2656 )] - public class QuestRedoChapterUI : IExcelRow + public class QuestRedoChapterUI : ExcelRow { - public LazyRow< Quest > Quest; - public byte Unknown1; - public LazyRow< QuestRedoChapterUICategory > Category; - public byte Unknown3; - public uint QuestRedoUISmall; - public uint QuestRedoUILarge; - public uint QuestRedoUIWide; - public SeString ChapterName; - public SeString ChapterPart; - public SeString Transient; + public LazyRow< Quest > Quest { get; set; } + public byte Unknown1 { get; set; } + public LazyRow< QuestRedoChapterUICategory > Category { get; set; } + public byte Unknown3 { get; set; } + public uint QuestRedoUISmall { get; set; } + public uint QuestRedoUILarge { get; set; } + public uint QuestRedoUIWide { get; set; } + public SeString ChapterName { get; set; } + public SeString ChapterPart { get; set; } + public SeString Transient { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Quest = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 0 ), language ); + Quest = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 0 ), language ); Unknown1 = parser.ReadColumn< byte >( 1 ); - Category = new LazyRow< QuestRedoChapterUICategory >( lumina, parser.ReadColumn< byte >( 2 ), language ); + Category = new LazyRow< QuestRedoChapterUICategory >( gameData, parser.ReadColumn< byte >( 2 ), language ); Unknown3 = parser.ReadColumn< byte >( 3 ); QuestRedoUISmall = parser.ReadColumn< uint >( 4 ); QuestRedoUILarge = parser.ReadColumn< uint >( 5 ); diff --git a/src/Lumina.Excel/GeneratedSheets/QuestRedoChapterUICategory.cs b/src/Lumina.Excel/GeneratedSheets/QuestRedoChapterUICategory.cs index c98e424c..20336775 100644 --- a/src/Lumina.Excel/GeneratedSheets/QuestRedoChapterUICategory.cs +++ b/src/Lumina.Excel/GeneratedSheets/QuestRedoChapterUICategory.cs @@ -7,19 +7,15 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "QuestRedoChapterUICategory", columnHash: 0x5eb59ccb )] - public class QuestRedoChapterUICategory : IExcelRow + public class QuestRedoChapterUICategory : ExcelRow { - public byte Unknown0; - public SeString Expac; + public byte Unknown0 { get; set; } + public SeString Expac { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< byte >( 0 ); Expac = parser.ReadColumn< SeString >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/QuestRedoChapterUITab.cs b/src/Lumina.Excel/GeneratedSheets/QuestRedoChapterUITab.cs index 3798a2ff..37753b2d 100644 --- a/src/Lumina.Excel/GeneratedSheets/QuestRedoChapterUITab.cs +++ b/src/Lumina.Excel/GeneratedSheets/QuestRedoChapterUITab.cs @@ -7,21 +7,17 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "QuestRedoChapterUITab", columnHash: 0x198356e8 )] - public class QuestRedoChapterUITab : IExcelRow + public class QuestRedoChapterUITab : ExcelRow { - public byte Unknown0; - public uint Icon1; - public uint Icon2; - public SeString Text; + public byte Unknown0 { get; set; } + public uint Icon1 { get; set; } + public uint Icon2 { get; set; } + public SeString Text { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< byte >( 0 ); Icon1 = parser.ReadColumn< uint >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/QuestRedoIncompChapter.cs b/src/Lumina.Excel/GeneratedSheets/QuestRedoIncompChapter.cs index 7a32b9cc..4dd6124e 100644 --- a/src/Lumina.Excel/GeneratedSheets/QuestRedoIncompChapter.cs +++ b/src/Lumina.Excel/GeneratedSheets/QuestRedoIncompChapter.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "QuestRedoIncompChapter", columnHash: 0xd870e208 )] - public class QuestRedoIncompChapter : IExcelRow + public class QuestRedoIncompChapter : ExcelRow { - public ushort Chapter; + public ushort Chapter { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Chapter = parser.ReadColumn< ushort >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/QuestRepeatFlag.cs b/src/Lumina.Excel/GeneratedSheets/QuestRepeatFlag.cs index 8cb13106..344acbec 100644 --- a/src/Lumina.Excel/GeneratedSheets/QuestRepeatFlag.cs +++ b/src/Lumina.Excel/GeneratedSheets/QuestRepeatFlag.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "QuestRepeatFlag", columnHash: 0xdbf43666 )] - public class QuestRepeatFlag : IExcelRow + public class QuestRepeatFlag : ExcelRow { - public LazyRow< Quest > Quest; + public LazyRow< Quest > Quest { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Quest = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 0 ), language ); + Quest = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 0 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/QuestRewardOther.cs b/src/Lumina.Excel/GeneratedSheets/QuestRewardOther.cs index 93a0da30..ef277494 100644 --- a/src/Lumina.Excel/GeneratedSheets/QuestRewardOther.cs +++ b/src/Lumina.Excel/GeneratedSheets/QuestRewardOther.cs @@ -7,19 +7,15 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "QuestRewardOther", columnHash: 0xaafab8d8 )] - public class QuestRewardOther : IExcelRow + public class QuestRewardOther : ExcelRow { - public uint Icon; - public SeString Name; + public uint Icon { get; set; } + public SeString Name { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Icon = parser.ReadColumn< uint >( 0 ); Name = parser.ReadColumn< SeString >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/QuickChat.cs b/src/Lumina.Excel/GeneratedSheets/QuickChat.cs index 44631dfc..eb2535ce 100644 --- a/src/Lumina.Excel/GeneratedSheets/QuickChat.cs +++ b/src/Lumina.Excel/GeneratedSheets/QuickChat.cs @@ -7,27 +7,23 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "QuickChat", columnHash: 0x66d693c5 )] - public class QuickChat : IExcelRow + public class QuickChat : ExcelRow { - public SeString NameAction; - public int Icon; - public LazyRow< Addon > Addon; - public LazyRow< QuickChatTransient > QuickChatTransient; - public ushort Unknown4; + public SeString NameAction { get; set; } + public int Icon { get; set; } + public LazyRow< Addon > Addon { get; set; } + public LazyRow< QuickChatTransient > QuickChatTransient { get; set; } + public ushort Unknown4 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); NameAction = parser.ReadColumn< SeString >( 0 ); Icon = parser.ReadColumn< int >( 1 ); - Addon = new LazyRow< Addon >( lumina, parser.ReadColumn< int >( 2 ), language ); - QuickChatTransient = new LazyRow< QuickChatTransient >( lumina, parser.ReadColumn< sbyte >( 3 ), language ); + Addon = new LazyRow< Addon >( gameData, parser.ReadColumn< int >( 2 ), language ); + QuickChatTransient = new LazyRow< QuickChatTransient >( gameData, parser.ReadColumn< sbyte >( 3 ), language ); Unknown4 = parser.ReadColumn< ushort >( 4 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/QuickChatTransient.cs b/src/Lumina.Excel/GeneratedSheets/QuickChatTransient.cs index e43c98af..5988a70f 100644 --- a/src/Lumina.Excel/GeneratedSheets/QuickChatTransient.cs +++ b/src/Lumina.Excel/GeneratedSheets/QuickChatTransient.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "QuickChatTransient", columnHash: 0xdebb20e3 )] - public class QuickChatTransient : IExcelRow + public class QuickChatTransient : ExcelRow { - public SeString TextOutput; + public SeString TextOutput { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); TextOutput = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/RPParameter.cs b/src/Lumina.Excel/GeneratedSheets/RPParameter.cs index 31741b6d..973c0193 100644 --- a/src/Lumina.Excel/GeneratedSheets/RPParameter.cs +++ b/src/Lumina.Excel/GeneratedSheets/RPParameter.cs @@ -7,23 +7,19 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "RPParameter", columnHash: 0x251a33cc )] - public class RPParameter : IExcelRow + public class RPParameter : ExcelRow { - public LazyRow< BNpcName > BNpcName; - public LazyRow< ClassJob > ClassJob; - public byte Unknown2; + public LazyRow< BNpcName > BNpcName { get; set; } + public LazyRow< ClassJob > ClassJob { get; set; } + public byte Unknown2 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - BNpcName = new LazyRow< BNpcName >( lumina, parser.ReadColumn< ushort >( 0 ), language ); - ClassJob = new LazyRow< ClassJob >( lumina, parser.ReadColumn< byte >( 1 ), language ); + BNpcName = new LazyRow< BNpcName >( gameData, parser.ReadColumn< ushort >( 0 ), language ); + ClassJob = new LazyRow< ClassJob >( gameData, parser.ReadColumn< byte >( 1 ), language ); Unknown2 = parser.ReadColumn< byte >( 2 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/Race.cs b/src/Lumina.Excel/GeneratedSheets/Race.cs index 0b7a6500..bc8ae82e 100644 --- a/src/Lumina.Excel/GeneratedSheets/Race.cs +++ b/src/Lumina.Excel/GeneratedSheets/Race.cs @@ -7,42 +7,38 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Race", columnHash: 0x3403807a )] - public class Race : IExcelRow + public class Race : ExcelRow { - public SeString Masculine; - public SeString Feminine; - public LazyRow< Item > RSEMBody; - public LazyRow< Item > RSEMHands; - public LazyRow< Item > RSEMLegs; - public LazyRow< Item > RSEMFeet; - public LazyRow< Item > RSEFBody; - public LazyRow< Item > RSEFHands; - public LazyRow< Item > RSEFLegs; - public LazyRow< Item > RSEFFeet; - public byte Unknown54; - public LazyRow< ExVersion > ExPac; + public SeString Masculine { get; set; } + public SeString Feminine { get; set; } + public LazyRow< Item > RSEMBody { get; set; } + public LazyRow< Item > RSEMHands { get; set; } + public LazyRow< Item > RSEMLegs { get; set; } + public LazyRow< Item > RSEMFeet { get; set; } + public LazyRow< Item > RSEFBody { get; set; } + public LazyRow< Item > RSEFHands { get; set; } + public LazyRow< Item > RSEFLegs { get; set; } + public LazyRow< Item > RSEFFeet { get; set; } + public byte Unknown54 { get; set; } + public LazyRow< ExVersion > ExPac { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Masculine = parser.ReadColumn< SeString >( 0 ); Feminine = parser.ReadColumn< SeString >( 1 ); - RSEMBody = new LazyRow< Item >( lumina, parser.ReadColumn< int >( 2 ), language ); - RSEMHands = new LazyRow< Item >( lumina, parser.ReadColumn< int >( 3 ), language ); - RSEMLegs = new LazyRow< Item >( lumina, parser.ReadColumn< int >( 4 ), language ); - RSEMFeet = new LazyRow< Item >( lumina, parser.ReadColumn< int >( 5 ), language ); - RSEFBody = new LazyRow< Item >( lumina, parser.ReadColumn< int >( 6 ), language ); - RSEFHands = new LazyRow< Item >( lumina, parser.ReadColumn< int >( 7 ), language ); - RSEFLegs = new LazyRow< Item >( lumina, parser.ReadColumn< int >( 8 ), language ); - RSEFFeet = new LazyRow< Item >( lumina, parser.ReadColumn< int >( 9 ), language ); + RSEMBody = new LazyRow< Item >( gameData, parser.ReadColumn< int >( 2 ), language ); + RSEMHands = new LazyRow< Item >( gameData, parser.ReadColumn< int >( 3 ), language ); + RSEMLegs = new LazyRow< Item >( gameData, parser.ReadColumn< int >( 4 ), language ); + RSEMFeet = new LazyRow< Item >( gameData, parser.ReadColumn< int >( 5 ), language ); + RSEFBody = new LazyRow< Item >( gameData, parser.ReadColumn< int >( 6 ), language ); + RSEFHands = new LazyRow< Item >( gameData, parser.ReadColumn< int >( 7 ), language ); + RSEFLegs = new LazyRow< Item >( gameData, parser.ReadColumn< int >( 8 ), language ); + RSEFFeet = new LazyRow< Item >( gameData, parser.ReadColumn< int >( 9 ), language ); Unknown54 = parser.ReadColumn< byte >( 10 ); - ExPac = new LazyRow< ExVersion >( lumina, parser.ReadColumn< byte >( 11 ), language ); + ExPac = new LazyRow< ExVersion >( gameData, parser.ReadColumn< byte >( 11 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/RacingChocoboItem.cs b/src/Lumina.Excel/GeneratedSheets/RacingChocoboItem.cs index 22e863d7..38f311b3 100644 --- a/src/Lumina.Excel/GeneratedSheets/RacingChocoboItem.cs +++ b/src/Lumina.Excel/GeneratedSheets/RacingChocoboItem.cs @@ -7,22 +7,18 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "RacingChocoboItem", columnHash: 0xe79dd9d4 )] - public class RacingChocoboItem : IExcelRow + public class RacingChocoboItem : ExcelRow { - public LazyRow< Item > Item; - public byte Category; - public byte[] Param; + public LazyRow< Item > Item { get; set; } + public byte Category { get; set; } + public byte[] Param { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Item = new LazyRow< Item >( lumina, parser.ReadColumn< int >( 0 ), language ); + Item = new LazyRow< Item >( gameData, parser.ReadColumn< int >( 0 ), language ); Category = parser.ReadColumn< byte >( 1 ); Param = new byte[ 2 ]; for( var i = 0; i < 2; i++ ) diff --git a/src/Lumina.Excel/GeneratedSheets/RacingChocoboName.cs b/src/Lumina.Excel/GeneratedSheets/RacingChocoboName.cs index 505cc974..e387fdc4 100644 --- a/src/Lumina.Excel/GeneratedSheets/RacingChocoboName.cs +++ b/src/Lumina.Excel/GeneratedSheets/RacingChocoboName.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "RacingChocoboName", columnHash: 0xdebb20e3 )] - public class RacingChocoboName : IExcelRow + public class RacingChocoboName : ExcelRow { - public SeString Name; + public SeString Name { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/RacingChocoboNameCategory.cs b/src/Lumina.Excel/GeneratedSheets/RacingChocoboNameCategory.cs index 32a14937..74155331 100644 --- a/src/Lumina.Excel/GeneratedSheets/RacingChocoboNameCategory.cs +++ b/src/Lumina.Excel/GeneratedSheets/RacingChocoboNameCategory.cs @@ -7,19 +7,15 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "RacingChocoboNameCategory", columnHash: 0x5eb59ccb )] - public class RacingChocoboNameCategory : IExcelRow + public class RacingChocoboNameCategory : ExcelRow { - public byte SortKey; - public SeString Name; + public byte SortKey { get; set; } + public SeString Name { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); SortKey = parser.ReadColumn< byte >( 0 ); Name = parser.ReadColumn< SeString >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/RacingChocoboNameInfo.cs b/src/Lumina.Excel/GeneratedSheets/RacingChocoboNameInfo.cs index 3f43a09e..32106c7e 100644 --- a/src/Lumina.Excel/GeneratedSheets/RacingChocoboNameInfo.cs +++ b/src/Lumina.Excel/GeneratedSheets/RacingChocoboNameInfo.cs @@ -7,27 +7,23 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "RacingChocoboNameInfo", columnHash: 0x171828cf )] - public class RacingChocoboNameInfo : IExcelRow + public class RacingChocoboNameInfo : ExcelRow { - public LazyRow< RacingChocoboNameCategory > RacingChocoboNameCategory; - public bool Unknown1; - public bool Unknown2; - public bool Unknown3; - public bool Unknown4; - public ushort Unknown5; - public ushort Unknown6; - public ushort Unknown7; + public LazyRow< RacingChocoboNameCategory > RacingChocoboNameCategory { get; set; } + public bool Unknown1 { get; set; } + public bool Unknown2 { get; set; } + public bool Unknown3 { get; set; } + public bool Unknown4 { get; set; } + public ushort Unknown5 { get; set; } + public ushort Unknown6 { get; set; } + public ushort Unknown7 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - RacingChocoboNameCategory = new LazyRow< RacingChocoboNameCategory >( lumina, parser.ReadColumn< byte >( 0 ), language ); + RacingChocoboNameCategory = new LazyRow< RacingChocoboNameCategory >( gameData, parser.ReadColumn< byte >( 0 ), language ); Unknown1 = parser.ReadColumn< bool >( 1 ); Unknown2 = parser.ReadColumn< bool >( 2 ); Unknown3 = parser.ReadColumn< bool >( 3 ); diff --git a/src/Lumina.Excel/GeneratedSheets/RacingChocoboParam.cs b/src/Lumina.Excel/GeneratedSheets/RacingChocoboParam.cs index d1e1685d..8391476b 100644 --- a/src/Lumina.Excel/GeneratedSheets/RacingChocoboParam.cs +++ b/src/Lumina.Excel/GeneratedSheets/RacingChocoboParam.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "RacingChocoboParam", columnHash: 0xdebb20e3 )] - public class RacingChocoboParam : IExcelRow + public class RacingChocoboParam : ExcelRow { - public SeString Name; + public SeString Name { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/RecastNavimesh.cs b/src/Lumina.Excel/GeneratedSheets/RecastNavimesh.cs index 362b1eb4..e73d7610 100644 --- a/src/Lumina.Excel/GeneratedSheets/RecastNavimesh.cs +++ b/src/Lumina.Excel/GeneratedSheets/RecastNavimesh.cs @@ -7,52 +7,48 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "RecastNavimesh", columnHash: 0x98c040df )] - public class RecastNavimesh : IExcelRow + public class RecastNavimesh : ExcelRow { - public SeString Unknown0; - public float TileSize; - public float CellSize; - public float CellHeight; - public float AgentHeight; - public float AgentRadius; - public float AgentMaxClimb; - public float AgentMaxSlope; - public bool Unknown8; - public float RegionMinSize; - public float RegionMergedSize; - public bool Unknown11; - public float MaxEdgeLength; - public float MaxEdgeError; - public float VertsPerPoly; - public float DetailMeshSampleDistance; - public float DetailMeshMaxSampleError; - public float Unknown17; - public float Unknown18; - public float Unknown19; - public float Unknown20; - public float Unknown21; - public float Unknown22; - public float Unknown23; - public float Unknown24; - public float Unknown25; - public float Unknown26; - public float Unknown27; - public float Unknown28; - public float Unknown29; - public bool Unknown30; - public float Unknown31; - public float Unknown32; - public float Unknown33; - public bool Unknown34; + public SeString Unknown0 { get; set; } + public float TileSize { get; set; } + public float CellSize { get; set; } + public float CellHeight { get; set; } + public float AgentHeight { get; set; } + public float AgentRadius { get; set; } + public float AgentMaxClimb { get; set; } + public float AgentMaxSlope { get; set; } + public bool Unknown8 { get; set; } + public float RegionMinSize { get; set; } + public float RegionMergedSize { get; set; } + public bool Unknown11 { get; set; } + public float MaxEdgeLength { get; set; } + public float MaxEdgeError { get; set; } + public float VertsPerPoly { get; set; } + public float DetailMeshSampleDistance { get; set; } + public float DetailMeshMaxSampleError { get; set; } + public float Unknown17 { get; set; } + public float Unknown18 { get; set; } + public float Unknown19 { get; set; } + public float Unknown20 { get; set; } + public float Unknown21 { get; set; } + public float Unknown22 { get; set; } + public float Unknown23 { get; set; } + public float Unknown24 { get; set; } + public float Unknown25 { get; set; } + public float Unknown26 { get; set; } + public float Unknown27 { get; set; } + public float Unknown28 { get; set; } + public float Unknown29 { get; set; } + public bool Unknown30 { get; set; } + public float Unknown31 { get; set; } + public float Unknown32 { get; set; } + public float Unknown33 { get; set; } + public bool Unknown34 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< SeString >( 0 ); TileSize = parser.ReadColumn< float >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/Recipe.cs b/src/Lumina.Excel/GeneratedSheets/Recipe.cs index 0d88a9da..90bb95d1 100644 --- a/src/Lumina.Excel/GeneratedSheets/Recipe.cs +++ b/src/Lumina.Excel/GeneratedSheets/Recipe.cs @@ -7,7 +7,7 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Recipe", columnHash: 0xf56e5856 )] - public class Recipe : IExcelRow + public class Recipe : ExcelRow { public struct UnkStruct5Struct { @@ -15,46 +15,42 @@ public struct UnkStruct5Struct public byte AmountIngredient; } - public int Number; - public LazyRow< CraftType > CraftType; - public LazyRow< RecipeLevelTable > RecipeLevelTable; - public LazyRow< Item > ItemResult; - public byte AmountResult; - public UnkStruct5Struct[] UnkStruct5; - public ushort Unknown25; - public bool IsSecondary; - public byte MaterialQualityFactor; - public ushort DifficultyFactor; - public ushort QualityFactor; - public ushort DurabilityFactor; - public ushort Unknown31; - public ushort RequiredCraftsmanship; - public ushort RequiredControl; - public ushort QuickSynthCraftsmanship; - public ushort QuickSynthControl; - public LazyRow< SecretRecipeBook > SecretRecipeBook; - public uint Unknown37; - public bool CanQuickSynth; - public bool CanHq; - public bool ExpRewarded; - public LazyRow< Status > StatusRequired; - public LazyRow< Item > ItemRequired; - public bool IsSpecializationRequired; - public bool IsExpert; - public ushort PatchNumber; + public int Number { get; set; } + public LazyRow< CraftType > CraftType { get; set; } + public LazyRow< RecipeLevelTable > RecipeLevelTable { get; set; } + public LazyRow< Item > ItemResult { get; set; } + public byte AmountResult { get; set; } + public UnkStruct5Struct[] UnkStruct5 { get; set; } + public ushort Unknown25 { get; set; } + public bool IsSecondary { get; set; } + public byte MaterialQualityFactor { get; set; } + public ushort DifficultyFactor { get; set; } + public ushort QualityFactor { get; set; } + public ushort DurabilityFactor { get; set; } + public ushort Unknown31 { get; set; } + public ushort RequiredCraftsmanship { get; set; } + public ushort RequiredControl { get; set; } + public ushort QuickSynthCraftsmanship { get; set; } + public ushort QuickSynthControl { get; set; } + public LazyRow< SecretRecipeBook > SecretRecipeBook { get; set; } + public uint Unknown37 { get; set; } + public bool CanQuickSynth { get; set; } + public bool CanHq { get; set; } + public bool ExpRewarded { get; set; } + public LazyRow< Status > StatusRequired { get; set; } + public LazyRow< Item > ItemRequired { get; set; } + public bool IsSpecializationRequired { get; set; } + public bool IsExpert { get; set; } + public ushort PatchNumber { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Number = parser.ReadColumn< int >( 0 ); - CraftType = new LazyRow< CraftType >( lumina, parser.ReadColumn< int >( 1 ), language ); - RecipeLevelTable = new LazyRow< RecipeLevelTable >( lumina, parser.ReadColumn< ushort >( 2 ), language ); - ItemResult = new LazyRow< Item >( lumina, parser.ReadColumn< int >( 3 ), language ); + CraftType = new LazyRow< CraftType >( gameData, parser.ReadColumn< int >( 1 ), language ); + RecipeLevelTable = new LazyRow< RecipeLevelTable >( gameData, parser.ReadColumn< ushort >( 2 ), language ); + ItemResult = new LazyRow< Item >( gameData, parser.ReadColumn< int >( 3 ), language ); AmountResult = parser.ReadColumn< byte >( 4 ); UnkStruct5 = new UnkStruct5Struct[ 10 ]; for( var i = 0; i < 10; i++ ) @@ -74,13 +70,13 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) RequiredControl = parser.ReadColumn< ushort >( 33 ); QuickSynthCraftsmanship = parser.ReadColumn< ushort >( 34 ); QuickSynthControl = parser.ReadColumn< ushort >( 35 ); - SecretRecipeBook = new LazyRow< SecretRecipeBook >( lumina, parser.ReadColumn< ushort >( 36 ), language ); + SecretRecipeBook = new LazyRow< SecretRecipeBook >( gameData, parser.ReadColumn< ushort >( 36 ), language ); Unknown37 = parser.ReadColumn< uint >( 37 ); CanQuickSynth = parser.ReadColumn< bool >( 38 ); CanHq = parser.ReadColumn< bool >( 39 ); ExpRewarded = parser.ReadColumn< bool >( 40 ); - StatusRequired = new LazyRow< Status >( lumina, parser.ReadColumn< int >( 41 ), language ); - ItemRequired = new LazyRow< Item >( lumina, parser.ReadColumn< int >( 42 ), language ); + StatusRequired = new LazyRow< Status >( gameData, parser.ReadColumn< int >( 41 ), language ); + ItemRequired = new LazyRow< Item >( gameData, parser.ReadColumn< int >( 42 ), language ); IsSpecializationRequired = parser.ReadColumn< bool >( 43 ); IsExpert = parser.ReadColumn< bool >( 44 ); PatchNumber = parser.ReadColumn< ushort >( 45 ); diff --git a/src/Lumina.Excel/GeneratedSheets/RecipeLevelTable.cs b/src/Lumina.Excel/GeneratedSheets/RecipeLevelTable.cs index de3bd6e3..f25a77e0 100644 --- a/src/Lumina.Excel/GeneratedSheets/RecipeLevelTable.cs +++ b/src/Lumina.Excel/GeneratedSheets/RecipeLevelTable.cs @@ -7,25 +7,21 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "RecipeLevelTable", columnHash: 0xdc8d702b )] - public class RecipeLevelTable : IExcelRow + public class RecipeLevelTable : ExcelRow { - public byte ClassJobLevel; - public byte Stars; - public ushort SuggestedCraftsmanship; - public ushort SuggestedControl; - public ushort Difficulty; - public uint Quality; - public ushort Durability; - public ushort Unknown54; + public byte ClassJobLevel { get; set; } + public byte Stars { get; set; } + public ushort SuggestedCraftsmanship { get; set; } + public ushort SuggestedControl { get; set; } + public ushort Difficulty { get; set; } + public uint Quality { get; set; } + public ushort Durability { get; set; } + public ushort ConditionsFlag { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); ClassJobLevel = parser.ReadColumn< byte >( 0 ); Stars = parser.ReadColumn< byte >( 1 ); @@ -34,7 +30,7 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) Difficulty = parser.ReadColumn< ushort >( 4 ); Quality = parser.ReadColumn< uint >( 5 ); Durability = parser.ReadColumn< ushort >( 6 ); - Unknown54 = parser.ReadColumn< ushort >( 7 ); + ConditionsFlag = parser.ReadColumn< ushort >( 7 ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/RecipeLookup.cs b/src/Lumina.Excel/GeneratedSheets/RecipeLookup.cs index 9f3814aa..3d7a3c5c 100644 --- a/src/Lumina.Excel/GeneratedSheets/RecipeLookup.cs +++ b/src/Lumina.Excel/GeneratedSheets/RecipeLookup.cs @@ -7,34 +7,30 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "RecipeLookup", columnHash: 0xa708a4a0 )] - public class RecipeLookup : IExcelRow + public class RecipeLookup : ExcelRow { - public LazyRow< Recipe > CRP; - public LazyRow< Recipe > BSM; - public LazyRow< Recipe > ARM; - public LazyRow< Recipe > GSM; - public LazyRow< Recipe > LTW; - public LazyRow< Recipe > WVR; - public LazyRow< Recipe > ALC; - public LazyRow< Recipe > CUL; + public LazyRow< Recipe > CRP { get; set; } + public LazyRow< Recipe > BSM { get; set; } + public LazyRow< Recipe > ARM { get; set; } + public LazyRow< Recipe > GSM { get; set; } + public LazyRow< Recipe > LTW { get; set; } + public LazyRow< Recipe > WVR { get; set; } + public LazyRow< Recipe > ALC { get; set; } + public LazyRow< Recipe > CUL { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - CRP = new LazyRow< Recipe >( lumina, parser.ReadColumn< ushort >( 0 ), language ); - BSM = new LazyRow< Recipe >( lumina, parser.ReadColumn< ushort >( 1 ), language ); - ARM = new LazyRow< Recipe >( lumina, parser.ReadColumn< ushort >( 2 ), language ); - GSM = new LazyRow< Recipe >( lumina, parser.ReadColumn< ushort >( 3 ), language ); - LTW = new LazyRow< Recipe >( lumina, parser.ReadColumn< ushort >( 4 ), language ); - WVR = new LazyRow< Recipe >( lumina, parser.ReadColumn< ushort >( 5 ), language ); - ALC = new LazyRow< Recipe >( lumina, parser.ReadColumn< ushort >( 6 ), language ); - CUL = new LazyRow< Recipe >( lumina, parser.ReadColumn< ushort >( 7 ), language ); + CRP = new LazyRow< Recipe >( gameData, parser.ReadColumn< ushort >( 0 ), language ); + BSM = new LazyRow< Recipe >( gameData, parser.ReadColumn< ushort >( 1 ), language ); + ARM = new LazyRow< Recipe >( gameData, parser.ReadColumn< ushort >( 2 ), language ); + GSM = new LazyRow< Recipe >( gameData, parser.ReadColumn< ushort >( 3 ), language ); + LTW = new LazyRow< Recipe >( gameData, parser.ReadColumn< ushort >( 4 ), language ); + WVR = new LazyRow< Recipe >( gameData, parser.ReadColumn< ushort >( 5 ), language ); + ALC = new LazyRow< Recipe >( gameData, parser.ReadColumn< ushort >( 6 ), language ); + CUL = new LazyRow< Recipe >( gameData, parser.ReadColumn< ushort >( 7 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/RecipeNotebookList.cs b/src/Lumina.Excel/GeneratedSheets/RecipeNotebookList.cs index 0e84f60b..50834fb4 100644 --- a/src/Lumina.Excel/GeneratedSheets/RecipeNotebookList.cs +++ b/src/Lumina.Excel/GeneratedSheets/RecipeNotebookList.cs @@ -7,24 +7,20 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "RecipeNotebookList", columnHash: 0xa067051f )] - public class RecipeNotebookList : IExcelRow + public class RecipeNotebookList : ExcelRow { - public byte Unknown0; - public LazyRow< Recipe >[] Recipe; + public byte Unknown0 { get; set; } + public LazyRow< Recipe >[] Recipe { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< byte >( 0 ); Recipe = new LazyRow< Recipe >[ 160 ]; for( var i = 0; i < 160; i++ ) - Recipe[ i ] = new LazyRow< Recipe >( lumina, parser.ReadColumn< int >( 1 + i ), language ); + Recipe[ i ] = new LazyRow< Recipe >( gameData, parser.ReadColumn< int >( 1 + i ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/RecommendContents.cs b/src/Lumina.Excel/GeneratedSheets/RecommendContents.cs index 016692cf..1e1a4539 100644 --- a/src/Lumina.Excel/GeneratedSheets/RecommendContents.cs +++ b/src/Lumina.Excel/GeneratedSheets/RecommendContents.cs @@ -7,24 +7,20 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "RecommendContents", columnHash: 0xe79dd9d4 )] - public class RecommendContents : IExcelRow + public class RecommendContents : ExcelRow { - public LazyRow< Level > Level; - public LazyRow< ClassJob > ClassJob; - public byte MinLevel; - public byte MaxLevel; + public LazyRow< Level > Level { get; set; } + public LazyRow< ClassJob > ClassJob { get; set; } + public byte MinLevel { get; set; } + public byte MaxLevel { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Level = new LazyRow< Level >( lumina, parser.ReadColumn< int >( 0 ), language ); - ClassJob = new LazyRow< ClassJob >( lumina, parser.ReadColumn< byte >( 1 ), language ); + Level = new LazyRow< Level >( gameData, parser.ReadColumn< int >( 0 ), language ); + ClassJob = new LazyRow< ClassJob >( gameData, parser.ReadColumn< byte >( 1 ), language ); MinLevel = parser.ReadColumn< byte >( 2 ); MaxLevel = parser.ReadColumn< byte >( 3 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/Relic.cs b/src/Lumina.Excel/GeneratedSheets/Relic.cs index 81515f74..68ed6568 100644 --- a/src/Lumina.Excel/GeneratedSheets/Relic.cs +++ b/src/Lumina.Excel/GeneratedSheets/Relic.cs @@ -7,50 +7,46 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Relic", columnHash: 0x8080ef57 )] - public class Relic : IExcelRow + public class Relic : ExcelRow { - public LazyRow< Item > ItemAtma; - public LazyRow< Item > ItemAnimus; - public int Icon; - public LazyRow< Materia > Materia0; - public LazyRow< RelicNote > NoteMain0; - public LazyRow< RelicNote > NoteSub0; - public LazyRow< RelicNote > NoteSelection10; - public LazyRow< Materia > Materia1; - public LazyRow< RelicNote > NoteMain1; - public LazyRow< RelicNote > NoteSub1; - public LazyRow< RelicNote > NoteSelection1; - public LazyRow< Materia > Materia2; - public LazyRow< RelicNote > NoteMain2; - public LazyRow< RelicNote > NoteSub2; - public LazyRow< Materia > Materia3; - public LazyRow< RelicNote > NoteSelection3; + public LazyRow< Item > ItemAtma { get; set; } + public LazyRow< Item > ItemAnimus { get; set; } + public int Icon { get; set; } + public LazyRow< Materia > Materia0 { get; set; } + public LazyRow< RelicNote > NoteMain0 { get; set; } + public LazyRow< RelicNote > NoteSub0 { get; set; } + public LazyRow< RelicNote > NoteSelection10 { get; set; } + public LazyRow< Materia > Materia1 { get; set; } + public LazyRow< RelicNote > NoteMain1 { get; set; } + public LazyRow< RelicNote > NoteSub1 { get; set; } + public LazyRow< RelicNote > NoteSelection1 { get; set; } + public LazyRow< Materia > Materia2 { get; set; } + public LazyRow< RelicNote > NoteMain2 { get; set; } + public LazyRow< RelicNote > NoteSub2 { get; set; } + public LazyRow< Materia > Materia3 { get; set; } + public LazyRow< RelicNote > NoteSelection3 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - ItemAtma = new LazyRow< Item >( lumina, parser.ReadColumn< uint >( 0 ), language ); - ItemAnimus = new LazyRow< Item >( lumina, parser.ReadColumn< uint >( 1 ), language ); + ItemAtma = new LazyRow< Item >( gameData, parser.ReadColumn< uint >( 0 ), language ); + ItemAnimus = new LazyRow< Item >( gameData, parser.ReadColumn< uint >( 1 ), language ); Icon = parser.ReadColumn< int >( 2 ); - Materia0 = new LazyRow< Materia >( lumina, parser.ReadColumn< ushort >( 3 ), language ); - NoteMain0 = new LazyRow< RelicNote >( lumina, parser.ReadColumn< byte >( 4 ), language ); - NoteSub0 = new LazyRow< RelicNote >( lumina, parser.ReadColumn< byte >( 5 ), language ); - NoteSelection10 = new LazyRow< RelicNote >( lumina, parser.ReadColumn< byte >( 6 ), language ); - Materia1 = new LazyRow< Materia >( lumina, parser.ReadColumn< ushort >( 7 ), language ); - NoteMain1 = new LazyRow< RelicNote >( lumina, parser.ReadColumn< byte >( 8 ), language ); - NoteSub1 = new LazyRow< RelicNote >( lumina, parser.ReadColumn< byte >( 9 ), language ); - NoteSelection1 = new LazyRow< RelicNote >( lumina, parser.ReadColumn< byte >( 10 ), language ); - Materia2 = new LazyRow< Materia >( lumina, parser.ReadColumn< ushort >( 11 ), language ); - NoteMain2 = new LazyRow< RelicNote >( lumina, parser.ReadColumn< byte >( 12 ), language ); - NoteSub2 = new LazyRow< RelicNote >( lumina, parser.ReadColumn< byte >( 13 ), language ); - Materia3 = new LazyRow< Materia >( lumina, parser.ReadColumn< ushort >( 14 ), language ); - NoteSelection3 = new LazyRow< RelicNote >( lumina, parser.ReadColumn< byte >( 15 ), language ); + Materia0 = new LazyRow< Materia >( gameData, parser.ReadColumn< ushort >( 3 ), language ); + NoteMain0 = new LazyRow< RelicNote >( gameData, parser.ReadColumn< byte >( 4 ), language ); + NoteSub0 = new LazyRow< RelicNote >( gameData, parser.ReadColumn< byte >( 5 ), language ); + NoteSelection10 = new LazyRow< RelicNote >( gameData, parser.ReadColumn< byte >( 6 ), language ); + Materia1 = new LazyRow< Materia >( gameData, parser.ReadColumn< ushort >( 7 ), language ); + NoteMain1 = new LazyRow< RelicNote >( gameData, parser.ReadColumn< byte >( 8 ), language ); + NoteSub1 = new LazyRow< RelicNote >( gameData, parser.ReadColumn< byte >( 9 ), language ); + NoteSelection1 = new LazyRow< RelicNote >( gameData, parser.ReadColumn< byte >( 10 ), language ); + Materia2 = new LazyRow< Materia >( gameData, parser.ReadColumn< ushort >( 11 ), language ); + NoteMain2 = new LazyRow< RelicNote >( gameData, parser.ReadColumn< byte >( 12 ), language ); + NoteSub2 = new LazyRow< RelicNote >( gameData, parser.ReadColumn< byte >( 13 ), language ); + Materia3 = new LazyRow< Materia >( gameData, parser.ReadColumn< ushort >( 14 ), language ); + NoteSelection3 = new LazyRow< RelicNote >( gameData, parser.ReadColumn< byte >( 15 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/Relic3.cs b/src/Lumina.Excel/GeneratedSheets/Relic3.cs index 167733cd..87eb9af0 100644 --- a/src/Lumina.Excel/GeneratedSheets/Relic3.cs +++ b/src/Lumina.Excel/GeneratedSheets/Relic3.cs @@ -7,28 +7,24 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Relic3", columnHash: 0xeb3c566a )] - public class Relic3 : IExcelRow + public class Relic3 : ExcelRow { - public LazyRow< Item > ItemAnimus; - public LazyRow< Item > ItemScroll; - public byte MateriaLimit; - public LazyRow< Item > ItemNovus; - public int Icon; - public sbyte Unknown5; + public LazyRow< Item > ItemAnimus { get; set; } + public LazyRow< Item > ItemScroll { get; set; } + public byte MateriaLimit { get; set; } + public LazyRow< Item > ItemNovus { get; set; } + public int Icon { get; set; } + public sbyte Unknown5 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - ItemAnimus = new LazyRow< Item >( lumina, parser.ReadColumn< uint >( 0 ), language ); - ItemScroll = new LazyRow< Item >( lumina, parser.ReadColumn< uint >( 1 ), language ); + ItemAnimus = new LazyRow< Item >( gameData, parser.ReadColumn< uint >( 0 ), language ); + ItemScroll = new LazyRow< Item >( gameData, parser.ReadColumn< uint >( 1 ), language ); MateriaLimit = parser.ReadColumn< byte >( 2 ); - ItemNovus = new LazyRow< Item >( lumina, parser.ReadColumn< uint >( 3 ), language ); + ItemNovus = new LazyRow< Item >( gameData, parser.ReadColumn< uint >( 3 ), language ); Icon = parser.ReadColumn< int >( 4 ); Unknown5 = parser.ReadColumn< sbyte >( 5 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/RelicItem.cs b/src/Lumina.Excel/GeneratedSheets/RelicItem.cs index 354249c5..81c6bada 100644 --- a/src/Lumina.Excel/GeneratedSheets/RelicItem.cs +++ b/src/Lumina.Excel/GeneratedSheets/RelicItem.cs @@ -7,47 +7,43 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "RelicItem", columnHash: 0xc8fc45d9 )] - public class RelicItem : IExcelRow + public class RelicItem : ExcelRow { - public byte Unknown0; - public LazyRow< Item > GladiatorItem; - public LazyRow< Item > PugilistItem; - public LazyRow< Item > MarauderItem; - public LazyRow< Item > LancerItem; - public LazyRow< Item > ArcherItem; - public LazyRow< Item > ConjurerItem; - public LazyRow< Item > ThaumaturgeItem; - public LazyRow< Item > ArcanistSMNItem; - public LazyRow< Item > ArcanistSCHItem; - public LazyRow< Item > ShieldItem; - public LazyRow< Item > RogueItem; - public uint Unknown12; - public uint Unknown13; - public uint Unknown14; - public uint Unknown15; - public uint Unknown16; + public byte Unknown0 { get; set; } + public LazyRow< Item > GladiatorItem { get; set; } + public LazyRow< Item > PugilistItem { get; set; } + public LazyRow< Item > MarauderItem { get; set; } + public LazyRow< Item > LancerItem { get; set; } + public LazyRow< Item > ArcherItem { get; set; } + public LazyRow< Item > ConjurerItem { get; set; } + public LazyRow< Item > ThaumaturgeItem { get; set; } + public LazyRow< Item > ArcanistSMNItem { get; set; } + public LazyRow< Item > ArcanistSCHItem { get; set; } + public LazyRow< Item > ShieldItem { get; set; } + public LazyRow< Item > RogueItem { get; set; } + public uint Unknown12 { get; set; } + public uint Unknown13 { get; set; } + public uint Unknown14 { get; set; } + public uint Unknown15 { get; set; } + public uint Unknown16 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< byte >( 0 ); - GladiatorItem = new LazyRow< Item >( lumina, parser.ReadColumn< uint >( 1 ), language ); - PugilistItem = new LazyRow< Item >( lumina, parser.ReadColumn< uint >( 2 ), language ); - MarauderItem = new LazyRow< Item >( lumina, parser.ReadColumn< uint >( 3 ), language ); - LancerItem = new LazyRow< Item >( lumina, parser.ReadColumn< uint >( 4 ), language ); - ArcherItem = new LazyRow< Item >( lumina, parser.ReadColumn< uint >( 5 ), language ); - ConjurerItem = new LazyRow< Item >( lumina, parser.ReadColumn< uint >( 6 ), language ); - ThaumaturgeItem = new LazyRow< Item >( lumina, parser.ReadColumn< uint >( 7 ), language ); - ArcanistSMNItem = new LazyRow< Item >( lumina, parser.ReadColumn< uint >( 8 ), language ); - ArcanistSCHItem = new LazyRow< Item >( lumina, parser.ReadColumn< uint >( 9 ), language ); - ShieldItem = new LazyRow< Item >( lumina, parser.ReadColumn< uint >( 10 ), language ); - RogueItem = new LazyRow< Item >( lumina, parser.ReadColumn< uint >( 11 ), language ); + GladiatorItem = new LazyRow< Item >( gameData, parser.ReadColumn< uint >( 1 ), language ); + PugilistItem = new LazyRow< Item >( gameData, parser.ReadColumn< uint >( 2 ), language ); + MarauderItem = new LazyRow< Item >( gameData, parser.ReadColumn< uint >( 3 ), language ); + LancerItem = new LazyRow< Item >( gameData, parser.ReadColumn< uint >( 4 ), language ); + ArcherItem = new LazyRow< Item >( gameData, parser.ReadColumn< uint >( 5 ), language ); + ConjurerItem = new LazyRow< Item >( gameData, parser.ReadColumn< uint >( 6 ), language ); + ThaumaturgeItem = new LazyRow< Item >( gameData, parser.ReadColumn< uint >( 7 ), language ); + ArcanistSMNItem = new LazyRow< Item >( gameData, parser.ReadColumn< uint >( 8 ), language ); + ArcanistSCHItem = new LazyRow< Item >( gameData, parser.ReadColumn< uint >( 9 ), language ); + ShieldItem = new LazyRow< Item >( gameData, parser.ReadColumn< uint >( 10 ), language ); + RogueItem = new LazyRow< Item >( gameData, parser.ReadColumn< uint >( 11 ), language ); Unknown12 = parser.ReadColumn< uint >( 12 ); Unknown13 = parser.ReadColumn< uint >( 13 ); Unknown14 = parser.ReadColumn< uint >( 14 ); diff --git a/src/Lumina.Excel/GeneratedSheets/RelicNote.cs b/src/Lumina.Excel/GeneratedSheets/RelicNote.cs index 794737b2..20323531 100644 --- a/src/Lumina.Excel/GeneratedSheets/RelicNote.cs +++ b/src/Lumina.Excel/GeneratedSheets/RelicNote.cs @@ -7,7 +7,7 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "RelicNote", columnHash: 0xb557320e )] - public class RelicNote : IExcelRow + public class RelicNote : ExcelRow { public struct UnkStruct1Struct { @@ -20,22 +20,18 @@ public struct UnkStruct25Struct public ushort PlaceNameFate; } - public LazyRow< EventItem > EventItem; - public UnkStruct1Struct[] UnkStruct1; - public LazyRow< MonsterNoteTarget >[] MonsterNoteTargetNM; - public ushort Unknown24; - public UnkStruct25Struct[] UnkStruct25; - public LazyRow< Leve >[] Leve; + public LazyRow< EventItem > EventItem { get; set; } + public UnkStruct1Struct[] UnkStruct1 { get; set; } + public LazyRow< MonsterNoteTarget >[] MonsterNoteTargetNM { get; set; } + public ushort Unknown24 { get; set; } + public UnkStruct25Struct[] UnkStruct25 { get; set; } + public LazyRow< Leve >[] Leve { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - EventItem = new LazyRow< EventItem >( lumina, parser.ReadColumn< uint >( 0 ), language ); + EventItem = new LazyRow< EventItem >( gameData, parser.ReadColumn< uint >( 0 ), language ); UnkStruct1 = new UnkStruct1Struct[ 10 ]; for( var i = 0; i < 10; i++ ) { @@ -45,7 +41,7 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) } MonsterNoteTargetNM = new LazyRow< MonsterNoteTarget >[ 3 ]; for( var i = 0; i < 3; i++ ) - MonsterNoteTargetNM[ i ] = new LazyRow< MonsterNoteTarget >( lumina, parser.ReadColumn< ushort >( 21 + i ), language ); + MonsterNoteTargetNM[ i ] = new LazyRow< MonsterNoteTarget >( gameData, parser.ReadColumn< ushort >( 21 + i ), language ); Unknown24 = parser.ReadColumn< ushort >( 24 ); UnkStruct25 = new UnkStruct25Struct[ 3 ]; for( var i = 0; i < 3; i++ ) @@ -56,7 +52,7 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) } Leve = new LazyRow< Leve >[ 3 ]; for( var i = 0; i < 3; i++ ) - Leve[ i ] = new LazyRow< Leve >( lumina, parser.ReadColumn< ushort >( 31 + i ), language ); + Leve[ i ] = new LazyRow< Leve >( gameData, parser.ReadColumn< ushort >( 31 + i ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/RelicNoteCategory.cs b/src/Lumina.Excel/GeneratedSheets/RelicNoteCategory.cs index c33ea20b..6c0efa62 100644 --- a/src/Lumina.Excel/GeneratedSheets/RelicNoteCategory.cs +++ b/src/Lumina.Excel/GeneratedSheets/RelicNoteCategory.cs @@ -7,19 +7,15 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "RelicNoteCategory", columnHash: 0xf8c2977f )] - public class RelicNoteCategory : IExcelRow + public class RelicNoteCategory : ExcelRow { - public sbyte Unknown0; - public SeString Text; + public sbyte Unknown0 { get; set; } + public SeString Text { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< sbyte >( 0 ); Text = parser.ReadColumn< SeString >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/Resident.cs b/src/Lumina.Excel/GeneratedSheets/Resident.cs index 5c555f51..677667ff 100644 --- a/src/Lumina.Excel/GeneratedSheets/Resident.cs +++ b/src/Lumina.Excel/GeneratedSheets/Resident.cs @@ -7,26 +7,22 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Resident", columnHash: 0x9af0b586 )] - public class Resident : IExcelRow + public class Resident : ExcelRow { - public byte Unknown0; - public ulong Model; - public LazyRow< NpcYell > NpcYell; - public ushort AddedIn53; - public byte ResidentMotionType; + public byte Unknown0 { get; set; } + public ulong Model { get; set; } + public LazyRow< NpcYell > NpcYell { get; set; } + public ushort AddedIn53 { get; set; } + public byte ResidentMotionType { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< byte >( 0 ); Model = parser.ReadColumn< ulong >( 1 ); - NpcYell = new LazyRow< NpcYell >( lumina, parser.ReadColumn< int >( 2 ), language ); + NpcYell = new LazyRow< NpcYell >( gameData, parser.ReadColumn< int >( 2 ), language ); AddedIn53 = parser.ReadColumn< ushort >( 3 ); ResidentMotionType = parser.ReadColumn< byte >( 4 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/ResistanceWeaponAdjust.cs b/src/Lumina.Excel/GeneratedSheets/ResistanceWeaponAdjust.cs new file mode 100644 index 00000000..44fb926e --- /dev/null +++ b/src/Lumina.Excel/GeneratedSheets/ResistanceWeaponAdjust.cs @@ -0,0 +1,30 @@ +// ReSharper disable All + +using Lumina.Text; +using Lumina.Data; +using Lumina.Data.Structs.Excel; + +namespace Lumina.Excel.GeneratedSheets +{ + [Sheet( "ResistanceWeaponAdjust", columnHash: 0x7af88458 )] + public class ResistanceWeaponAdjust : ExcelRow + { + + public ushort MaxTotalStats { get; set; } + public ushort MaxEachStat { get; set; } + public LazyRow< BaseParam >[] BaseParam { get; set; } + public uint Image { get; set; } + + public override void PopulateData( RowParser parser, GameData gameData, Language language ) + { + base.PopulateData( parser, gameData, language ); + + MaxTotalStats = parser.ReadColumn< ushort >( 0 ); + MaxEachStat = parser.ReadColumn< ushort >( 1 ); + BaseParam = new LazyRow< BaseParam >[ 4 ]; + for( var i = 0; i < 4; i++ ) + BaseParam[ i ] = new LazyRow< BaseParam >( gameData, parser.ReadColumn< byte >( 2 + i ), language ); + Image = parser.ReadColumn< uint >( 6 ); + } + } +} \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/RetainerTask.cs b/src/Lumina.Excel/GeneratedSheets/RetainerTask.cs index 76d2a885..4c1eab18 100644 --- a/src/Lumina.Excel/GeneratedSheets/RetainerTask.cs +++ b/src/Lumina.Excel/GeneratedSheets/RetainerTask.cs @@ -7,37 +7,33 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "RetainerTask", columnHash: 0x99415e4e )] - public class RetainerTask : IExcelRow + public class RetainerTask : ExcelRow { - public bool IsRandom; - public LazyRow< ClassJobCategory > ClassJobCategory; - public byte RetainerLevel; - public ushort Unknown3; - public LazyRow< RetainerTaskParameter > RetainerTaskParameter; - public ushort VentureCost; - public ushort MaxTimemin; - public int Experience; - public ushort RequiredItemLevel; - public byte ConditionParam0; - public byte ConditionParam1; - public ushort RequiredGathering; - public ushort Unknown12; - public ushort Task; + public bool IsRandom { get; set; } + public LazyRow< ClassJobCategory > ClassJobCategory { get; set; } + public byte RetainerLevel { get; set; } + public ushort Unknown3 { get; set; } + public LazyRow< RetainerTaskParameter > RetainerTaskParameter { get; set; } + public ushort VentureCost { get; set; } + public ushort MaxTimemin { get; set; } + public int Experience { get; set; } + public ushort RequiredItemLevel { get; set; } + public byte ConditionParam0 { get; set; } + public byte ConditionParam1 { get; set; } + public ushort RequiredGathering { get; set; } + public ushort Unknown12 { get; set; } + public ushort Task { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); IsRandom = parser.ReadColumn< bool >( 0 ); - ClassJobCategory = new LazyRow< ClassJobCategory >( lumina, parser.ReadColumn< byte >( 1 ), language ); + ClassJobCategory = new LazyRow< ClassJobCategory >( gameData, parser.ReadColumn< byte >( 1 ), language ); RetainerLevel = parser.ReadColumn< byte >( 2 ); Unknown3 = parser.ReadColumn< ushort >( 3 ); - RetainerTaskParameter = new LazyRow< RetainerTaskParameter >( lumina, parser.ReadColumn< ushort >( 4 ), language ); + RetainerTaskParameter = new LazyRow< RetainerTaskParameter >( gameData, parser.ReadColumn< ushort >( 4 ), language ); VentureCost = parser.ReadColumn< ushort >( 5 ); MaxTimemin = parser.ReadColumn< ushort >( 6 ); Experience = parser.ReadColumn< int >( 7 ); diff --git a/src/Lumina.Excel/GeneratedSheets/RetainerTaskLvRange.cs b/src/Lumina.Excel/GeneratedSheets/RetainerTaskLvRange.cs index 4223d1e7..758cdabb 100644 --- a/src/Lumina.Excel/GeneratedSheets/RetainerTaskLvRange.cs +++ b/src/Lumina.Excel/GeneratedSheets/RetainerTaskLvRange.cs @@ -7,19 +7,15 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "RetainerTaskLvRange", columnHash: 0xde74b4c4 )] - public class RetainerTaskLvRange : IExcelRow + public class RetainerTaskLvRange : ExcelRow { - public byte Min; - public byte Max; + public byte Min { get; set; } + public byte Max { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Min = parser.ReadColumn< byte >( 0 ); Max = parser.ReadColumn< byte >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/RetainerTaskNormal.cs b/src/Lumina.Excel/GeneratedSheets/RetainerTaskNormal.cs index 5acb68fb..133a1aa4 100644 --- a/src/Lumina.Excel/GeneratedSheets/RetainerTaskNormal.cs +++ b/src/Lumina.Excel/GeneratedSheets/RetainerTaskNormal.cs @@ -7,29 +7,25 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "RetainerTaskNormal", columnHash: 0x81338da6 )] - public class RetainerTaskNormal : IExcelRow + public class RetainerTaskNormal : ExcelRow { - public LazyRow< Item > Item; - public byte Quantity0; - public byte Quantity1; - public byte Quantity2; - public LazyRow< GatheringItem > GatheringLog; - public short FishingLog; + public LazyRow< Item > Item { get; set; } + public byte Quantity0 { get; set; } + public byte Quantity1 { get; set; } + public byte Quantity2 { get; set; } + public LazyRow< GatheringItem > GatheringLog { get; set; } + public short FishingLog { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Item = new LazyRow< Item >( lumina, parser.ReadColumn< int >( 0 ), language ); + Item = new LazyRow< Item >( gameData, parser.ReadColumn< int >( 0 ), language ); Quantity0 = parser.ReadColumn< byte >( 1 ); Quantity1 = parser.ReadColumn< byte >( 2 ); Quantity2 = parser.ReadColumn< byte >( 3 ); - GatheringLog = new LazyRow< GatheringItem >( lumina, parser.ReadColumn< short >( 4 ), language ); + GatheringLog = new LazyRow< GatheringItem >( gameData, parser.ReadColumn< short >( 4 ), language ); FishingLog = parser.ReadColumn< short >( 5 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/RetainerTaskParameter.cs b/src/Lumina.Excel/GeneratedSheets/RetainerTaskParameter.cs index d8392343..30b792c0 100644 --- a/src/Lumina.Excel/GeneratedSheets/RetainerTaskParameter.cs +++ b/src/Lumina.Excel/GeneratedSheets/RetainerTaskParameter.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "RetainerTaskParameter", columnHash: 0xcbd32284 )] - public class RetainerTaskParameter : IExcelRow + public class RetainerTaskParameter : ExcelRow { - public short[] ItemLevelDoW; - public short[] GatheringDoL; - public short[] GatheringFSH; + public short[] ItemLevelDoW { get; set; } + public short[] GatheringDoL { get; set; } + public short[] GatheringFSH { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); ItemLevelDoW = new short[ 2 ]; for( var i = 0; i < 2; i++ ) diff --git a/src/Lumina.Excel/GeneratedSheets/RetainerTaskRandom.cs b/src/Lumina.Excel/GeneratedSheets/RetainerTaskRandom.cs index e0e5626f..d70881e5 100644 --- a/src/Lumina.Excel/GeneratedSheets/RetainerTaskRandom.cs +++ b/src/Lumina.Excel/GeneratedSheets/RetainerTaskRandom.cs @@ -7,19 +7,15 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "RetainerTaskRandom", columnHash: 0x9ab94c53 )] - public class RetainerTaskRandom : IExcelRow + public class RetainerTaskRandom : ExcelRow { - public SeString Name; - public short Requirement; + public SeString Name { get; set; } + public short Requirement { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); Requirement = parser.ReadColumn< short >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/RideShooting.cs b/src/Lumina.Excel/GeneratedSheets/RideShooting.cs index 7959747d..985f58fe 100644 --- a/src/Lumina.Excel/GeneratedSheets/RideShooting.cs +++ b/src/Lumina.Excel/GeneratedSheets/RideShooting.cs @@ -7,121 +7,117 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "RideShooting", columnHash: 0xdd593ecd )] - public class RideShooting : IExcelRow + public class RideShooting : ExcelRow { - public LazyRow< GFateRideShooting > GFateRideShooting; - public short Unknown1; - public short Unknown2; - public ushort Unknown3; - public ushort Unknown4; - public LazyRow< RideShootingTextData > StartText; - public uint Unknown6; - public uint Unknown7; - public uint Unknown8; - public uint Unknown9; - public uint Unknown10; - public uint Unknown11; - public uint Unknown12; - public uint Unknown13; - public uint[] PopRange; - public LazyRow< ENpcBase >[] ENpc; - public byte[] ENpcScale; - public uint Unknown38; - public uint Unknown39; - public uint Unknown40; - public uint Unknown41; - public uint Unknown42; - public uint Unknown43; - public uint Unknown44; - public uint Unknown45; - public byte Unknown46; - public byte Unknown47; - public byte Unknown48; - public byte Unknown49; - public byte Unknown50; - public byte Unknown51; - public byte Unknown52; - public byte Unknown53; - public uint Unknown54; - public uint Unknown55; - public uint Unknown56; - public uint Unknown57; - public uint Unknown58; - public uint Unknown59; - public uint Unknown60; - public uint Unknown61; - public byte Unknown62; - public byte Unknown63; - public byte Unknown64; - public byte Unknown65; - public byte Unknown66; - public byte Unknown67; - public byte Unknown68; - public byte Unknown69; - public uint Unknown70; - public uint Unknown71; - public uint Unknown72; - public uint Unknown73; - public uint Unknown74; - public uint Unknown75; - public uint Unknown76; - public uint Unknown77; - public byte Unknown78; - public byte Unknown79; - public byte Unknown80; - public byte Unknown81; - public byte Unknown82; - public byte Unknown83; - public byte Unknown84; - public byte Unknown85; - public uint Unknown86; - public uint Unknown87; - public uint Unknown88; - public uint Unknown89; - public uint Unknown90; - public uint Unknown91; - public uint Unknown92; - public uint Unknown93; - public byte Unknown94; - public byte Unknown95; - public byte Unknown96; - public byte Unknown97; - public byte Unknown98; - public byte Unknown99; - public byte Unknown100; - public byte Unknown101; - public uint Unknown102; - public uint Unknown103; - public uint Unknown104; - public uint Unknown105; - public uint Unknown106; - public uint Unknown107; - public uint Unknown108; - public uint Unknown109; - public byte Unknown110; - public byte Unknown111; - public byte Unknown112; - public byte Unknown113; - public byte Unknown114; - public byte Unknown115; - public byte Unknown116; - public byte Unknown117; + public LazyRow< GFateRideShooting > GFateRideShooting { get; set; } + public short Unknown1 { get; set; } + public short Unknown2 { get; set; } + public ushort Unknown3 { get; set; } + public ushort Unknown4 { get; set; } + public LazyRow< RideShootingTextData > StartText { get; set; } + public uint Unknown6 { get; set; } + public uint Unknown7 { get; set; } + public uint Unknown8 { get; set; } + public uint Unknown9 { get; set; } + public uint Unknown10 { get; set; } + public uint Unknown11 { get; set; } + public uint Unknown12 { get; set; } + public uint Unknown13 { get; set; } + public uint[] PopRange { get; set; } + public LazyRow< ENpcBase >[] ENpc { get; set; } + public byte[] ENpcScale { get; set; } + public uint Unknown38 { get; set; } + public uint Unknown39 { get; set; } + public uint Unknown40 { get; set; } + public uint Unknown41 { get; set; } + public uint Unknown42 { get; set; } + public uint Unknown43 { get; set; } + public uint Unknown44 { get; set; } + public uint Unknown45 { get; set; } + public byte Unknown46 { get; set; } + public byte Unknown47 { get; set; } + public byte Unknown48 { get; set; } + public byte Unknown49 { get; set; } + public byte Unknown50 { get; set; } + public byte Unknown51 { get; set; } + public byte Unknown52 { get; set; } + public byte Unknown53 { get; set; } + public uint Unknown54 { get; set; } + public uint Unknown55 { get; set; } + public uint Unknown56 { get; set; } + public uint Unknown57 { get; set; } + public uint Unknown58 { get; set; } + public uint Unknown59 { get; set; } + public uint Unknown60 { get; set; } + public uint Unknown61 { get; set; } + public byte Unknown62 { get; set; } + public byte Unknown63 { get; set; } + public byte Unknown64 { get; set; } + public byte Unknown65 { get; set; } + public byte Unknown66 { get; set; } + public byte Unknown67 { get; set; } + public byte Unknown68 { get; set; } + public byte Unknown69 { get; set; } + public uint Unknown70 { get; set; } + public uint Unknown71 { get; set; } + public uint Unknown72 { get; set; } + public uint Unknown73 { get; set; } + public uint Unknown74 { get; set; } + public uint Unknown75 { get; set; } + public uint Unknown76 { get; set; } + public uint Unknown77 { get; set; } + public byte Unknown78 { get; set; } + public byte Unknown79 { get; set; } + public byte Unknown80 { get; set; } + public byte Unknown81 { get; set; } + public byte Unknown82 { get; set; } + public byte Unknown83 { get; set; } + public byte Unknown84 { get; set; } + public byte Unknown85 { get; set; } + public uint Unknown86 { get; set; } + public uint Unknown87 { get; set; } + public uint Unknown88 { get; set; } + public uint Unknown89 { get; set; } + public uint Unknown90 { get; set; } + public uint Unknown91 { get; set; } + public uint Unknown92 { get; set; } + public uint Unknown93 { get; set; } + public byte Unknown94 { get; set; } + public byte Unknown95 { get; set; } + public byte Unknown96 { get; set; } + public byte Unknown97 { get; set; } + public byte Unknown98 { get; set; } + public byte Unknown99 { get; set; } + public byte Unknown100 { get; set; } + public byte Unknown101 { get; set; } + public uint Unknown102 { get; set; } + public uint Unknown103 { get; set; } + public uint Unknown104 { get; set; } + public uint Unknown105 { get; set; } + public uint Unknown106 { get; set; } + public uint Unknown107 { get; set; } + public uint Unknown108 { get; set; } + public uint Unknown109 { get; set; } + public byte Unknown110 { get; set; } + public byte Unknown111 { get; set; } + public byte Unknown112 { get; set; } + public byte Unknown113 { get; set; } + public byte Unknown114 { get; set; } + public byte Unknown115 { get; set; } + public byte Unknown116 { get; set; } + public byte Unknown117 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - GFateRideShooting = new LazyRow< GFateRideShooting >( lumina, parser.ReadColumn< ushort >( 0 ), language ); + GFateRideShooting = new LazyRow< GFateRideShooting >( gameData, parser.ReadColumn< ushort >( 0 ), language ); Unknown1 = parser.ReadColumn< short >( 1 ); Unknown2 = parser.ReadColumn< short >( 2 ); Unknown3 = parser.ReadColumn< ushort >( 3 ); Unknown4 = parser.ReadColumn< ushort >( 4 ); - StartText = new LazyRow< RideShootingTextData >( lumina, parser.ReadColumn< ushort >( 5 ), language ); + StartText = new LazyRow< RideShootingTextData >( gameData, parser.ReadColumn< ushort >( 5 ), language ); Unknown6 = parser.ReadColumn< uint >( 6 ); Unknown7 = parser.ReadColumn< uint >( 7 ); Unknown8 = parser.ReadColumn< uint >( 8 ); @@ -135,7 +131,7 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) PopRange[ i ] = parser.ReadColumn< uint >( 14 + i ); ENpc = new LazyRow< ENpcBase >[ 8 ]; for( var i = 0; i < 8; i++ ) - ENpc[ i ] = new LazyRow< ENpcBase >( lumina, parser.ReadColumn< uint >( 22 + i ), language ); + ENpc[ i ] = new LazyRow< ENpcBase >( gameData, parser.ReadColumn< uint >( 22 + i ), language ); ENpcScale = new byte[ 8 ]; for( var i = 0; i < 8; i++ ) ENpcScale[ i ] = parser.ReadColumn< byte >( 30 + i ); diff --git a/src/Lumina.Excel/GeneratedSheets/RideShootingTextData.cs b/src/Lumina.Excel/GeneratedSheets/RideShootingTextData.cs index e874bdc3..1065fc73 100644 --- a/src/Lumina.Excel/GeneratedSheets/RideShootingTextData.cs +++ b/src/Lumina.Excel/GeneratedSheets/RideShootingTextData.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "RideShootingTextData", columnHash: 0xdebb20e3 )] - public class RideShootingTextData : IExcelRow + public class RideShootingTextData : ExcelRow { - public SeString String; + public SeString String { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); String = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/SatisfactionArbitration.cs b/src/Lumina.Excel/GeneratedSheets/SatisfactionArbitration.cs index 527ff9be..9d7734a9 100644 --- a/src/Lumina.Excel/GeneratedSheets/SatisfactionArbitration.cs +++ b/src/Lumina.Excel/GeneratedSheets/SatisfactionArbitration.cs @@ -7,25 +7,21 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "SatisfactionArbitration", columnHash: 0x3f77b2e9 )] - public class SatisfactionArbitration : IExcelRow + public class SatisfactionArbitration : ExcelRow { - public byte Unknown0; - public byte Unknown1; - public LazyRow< Quest > Quest; - public byte Unknown3; + public byte Unknown0 { get; set; } + public byte Unknown1 { get; set; } + public LazyRow< Quest > Quest { get; set; } + public byte Unknown3 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< byte >( 0 ); Unknown1 = parser.ReadColumn< byte >( 1 ); - Quest = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 2 ), language ); + Quest = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 2 ), language ); Unknown3 = parser.ReadColumn< byte >( 3 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/SatisfactionNpc.cs b/src/Lumina.Excel/GeneratedSheets/SatisfactionNpc.cs index 0c84a0bc..6ec49fcf 100644 --- a/src/Lumina.Excel/GeneratedSheets/SatisfactionNpc.cs +++ b/src/Lumina.Excel/GeneratedSheets/SatisfactionNpc.cs @@ -7,7 +7,7 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "SatisfactionNpc", columnHash: 0x652420ba )] - public class SatisfactionNpc : IExcelRow + public class SatisfactionNpc : ExcelRow { public struct UnkStruct16Struct { @@ -16,73 +16,69 @@ public struct UnkStruct16Struct public int IsHQ; } - public LazyRow< ENpcResident > Npc; - public LazyRow< Quest > QuestRequired; - public byte LevelUnlock; - public byte DeliveriesPerWeek; - public int[] SupplyIndex; - public ushort[] SatisfactionRequired; - public UnkStruct16Struct[] UnkStruct16; - public byte Unknown25; - public byte Unknown26; - public byte Unknown27; - public bool Unknown28; - public bool Unknown29; - public bool Unknown30; - public bool Unknown31; - public bool Unknown32; - public bool Unknown33; - public int Unknown34; - public int Unknown35; - public int Unknown36; - public int Unknown37; - public int Unknown38; - public int Unknown39; - public byte Unknown40; - public byte Unknown41; - public byte Unknown42; - public byte Unknown43; - public byte Unknown44; - public byte Unknown45; - public bool Unknown46; - public bool Unknown47; - public bool Unknown48; - public bool Unknown49; - public bool Unknown50; - public bool Unknown51; - public int Unknown52; - public int Unknown53; - public int Unknown54; - public int Unknown55; - public int Unknown56; - public int Unknown57; - public byte Unknown58; - public byte Unknown59; - public byte Unknown60; - public byte Unknown61; - public byte Unknown62; - public byte Unknown63; - public bool Unknown64; - public bool Unknown65; - public bool Unknown66; - public bool Unknown67; - public bool Unknown68; - public bool Unknown69; - public int Icon; - public byte Unknown71; - public byte AddedIn530; - public byte AddedIn531; + public LazyRow< ENpcResident > Npc { get; set; } + public LazyRow< Quest > QuestRequired { get; set; } + public byte LevelUnlock { get; set; } + public byte DeliveriesPerWeek { get; set; } + public int[] SupplyIndex { get; set; } + public ushort[] SatisfactionRequired { get; set; } + public UnkStruct16Struct[] UnkStruct16 { get; set; } + public byte Unknown25 { get; set; } + public byte Unknown26 { get; set; } + public byte Unknown27 { get; set; } + public bool Unknown28 { get; set; } + public bool Unknown29 { get; set; } + public bool Unknown30 { get; set; } + public bool Unknown31 { get; set; } + public bool Unknown32 { get; set; } + public bool Unknown33 { get; set; } + public int Unknown34 { get; set; } + public int Unknown35 { get; set; } + public int Unknown36 { get; set; } + public int Unknown37 { get; set; } + public int Unknown38 { get; set; } + public int Unknown39 { get; set; } + public byte Unknown40 { get; set; } + public byte Unknown41 { get; set; } + public byte Unknown42 { get; set; } + public byte Unknown43 { get; set; } + public byte Unknown44 { get; set; } + public byte Unknown45 { get; set; } + public bool Unknown46 { get; set; } + public bool Unknown47 { get; set; } + public bool Unknown48 { get; set; } + public bool Unknown49 { get; set; } + public bool Unknown50 { get; set; } + public bool Unknown51 { get; set; } + public int Unknown52 { get; set; } + public int Unknown53 { get; set; } + public int Unknown54 { get; set; } + public int Unknown55 { get; set; } + public int Unknown56 { get; set; } + public int Unknown57 { get; set; } + public byte Unknown58 { get; set; } + public byte Unknown59 { get; set; } + public byte Unknown60 { get; set; } + public byte Unknown61 { get; set; } + public byte Unknown62 { get; set; } + public byte Unknown63 { get; set; } + public bool Unknown64 { get; set; } + public bool Unknown65 { get; set; } + public bool Unknown66 { get; set; } + public bool Unknown67 { get; set; } + public bool Unknown68 { get; set; } + public bool Unknown69 { get; set; } + public int Icon { get; set; } + public byte Unknown71 { get; set; } + public byte AddedIn530 { get; set; } + public byte AddedIn531 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Npc = new LazyRow< ENpcResident >( lumina, parser.ReadColumn< int >( 0 ), language ); - QuestRequired = new LazyRow< Quest >( lumina, parser.ReadColumn< int >( 1 ), language ); + Npc = new LazyRow< ENpcResident >( gameData, parser.ReadColumn< int >( 0 ), language ); + QuestRequired = new LazyRow< Quest >( gameData, parser.ReadColumn< int >( 1 ), language ); LevelUnlock = parser.ReadColumn< byte >( 2 ); DeliveriesPerWeek = parser.ReadColumn< byte >( 3 ); SupplyIndex = new int[ 6 ]; diff --git a/src/Lumina.Excel/GeneratedSheets/SatisfactionSupply.cs b/src/Lumina.Excel/GeneratedSheets/SatisfactionSupply.cs index 8612df0f..94796dea 100644 --- a/src/Lumina.Excel/GeneratedSheets/SatisfactionSupply.cs +++ b/src/Lumina.Excel/GeneratedSheets/SatisfactionSupply.cs @@ -7,32 +7,28 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "SatisfactionSupply", columnHash: 0x2d608ea2 )] - public class SatisfactionSupply : IExcelRow + public class SatisfactionSupply : ExcelRow { - public byte Slot; - public byte ProbabilityPct; - public LazyRow< Item > Item; - public ushort CollectabilityLow; - public ushort CollectabilityMid; - public ushort CollectabilityHigh; - public LazyRow< SatisfactionSupplyReward > Reward; + public byte Slot { get; set; } + public byte ProbabilityPct { get; set; } + public LazyRow< Item > Item { get; set; } + public ushort CollectabilityLow { get; set; } + public ushort CollectabilityMid { get; set; } + public ushort CollectabilityHigh { get; set; } + public LazyRow< SatisfactionSupplyReward > Reward { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Slot = parser.ReadColumn< byte >( 0 ); ProbabilityPct = parser.ReadColumn< byte >( 1 ); - Item = new LazyRow< Item >( lumina, parser.ReadColumn< int >( 2 ), language ); + Item = new LazyRow< Item >( gameData, parser.ReadColumn< int >( 2 ), language ); CollectabilityLow = parser.ReadColumn< ushort >( 3 ); CollectabilityMid = parser.ReadColumn< ushort >( 4 ); CollectabilityHigh = parser.ReadColumn< ushort >( 5 ); - Reward = new LazyRow< SatisfactionSupplyReward >( lumina, parser.ReadColumn< ushort >( 6 ), language ); + Reward = new LazyRow< SatisfactionSupplyReward >( gameData, parser.ReadColumn< ushort >( 6 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/SatisfactionSupplyReward.cs b/src/Lumina.Excel/GeneratedSheets/SatisfactionSupplyReward.cs index b4c7852a..6e42d83c 100644 --- a/src/Lumina.Excel/GeneratedSheets/SatisfactionSupplyReward.cs +++ b/src/Lumina.Excel/GeneratedSheets/SatisfactionSupplyReward.cs @@ -7,7 +7,7 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "SatisfactionSupplyReward", columnHash: 0xc81395f9 )] - public class SatisfactionSupplyReward : IExcelRow + public class SatisfactionSupplyReward : ExcelRow { public struct UnkStruct1Struct { @@ -17,23 +17,19 @@ public struct UnkStruct1Struct public ushort QuantityHigh; } - public byte Unknown0; - public UnkStruct1Struct[] UnkStruct1; - public byte Unknown9; - public ushort SatisfactionLow; - public ushort SatisfactionMid; - public ushort SatisfactionHigh; - public ushort GilLow; - public ushort GilMid; - public ushort GilHigh; + public byte Unknown0 { get; set; } + public UnkStruct1Struct[] UnkStruct1 { get; set; } + public byte Unknown9 { get; set; } + public ushort SatisfactionLow { get; set; } + public ushort SatisfactionMid { get; set; } + public ushort SatisfactionHigh { get; set; } + public ushort GilLow { get; set; } + public ushort GilMid { get; set; } + public ushort GilHigh { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< byte >( 0 ); UnkStruct1 = new UnkStruct1Struct[ 2 ]; diff --git a/src/Lumina.Excel/GeneratedSheets/ScenarioTree.cs b/src/Lumina.Excel/GeneratedSheets/ScenarioTree.cs index e6f36d95..d40d91db 100644 --- a/src/Lumina.Excel/GeneratedSheets/ScenarioTree.cs +++ b/src/Lumina.Excel/GeneratedSheets/ScenarioTree.cs @@ -7,26 +7,22 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ScenarioTree", columnHash: 0x6840e93a )] - public class ScenarioTree : IExcelRow + public class ScenarioTree : ExcelRow { - public LazyRow< ScenarioType > Type; - public LazyRow< ScreenImage > Image; - public uint Unknown2; - public uint Unknown540; - public SeString Unknown541; - public int Unknown542; + public LazyRow< ScenarioType > Type { get; set; } + public LazyRow< ScreenImage > Image { get; set; } + public uint Unknown2 { get; set; } + public uint Unknown540 { get; set; } + public SeString Unknown541 { get; set; } + public int Unknown542 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Type = new LazyRow< ScenarioType >( lumina, parser.ReadColumn< byte >( 0 ), language ); - Image = new LazyRow< ScreenImage >( lumina, parser.ReadColumn< ushort >( 1 ), language ); + Type = new LazyRow< ScenarioType >( gameData, parser.ReadColumn< byte >( 0 ), language ); + Image = new LazyRow< ScreenImage >( gameData, parser.ReadColumn< ushort >( 1 ), language ); Unknown2 = parser.ReadColumn< uint >( 2 ); Unknown540 = parser.ReadColumn< uint >( 3 ); Unknown541 = parser.ReadColumn< SeString >( 4 ); diff --git a/src/Lumina.Excel/GeneratedSheets/ScenarioTreeTips.cs b/src/Lumina.Excel/GeneratedSheets/ScenarioTreeTips.cs index 4605a0cf..43a5e566 100644 --- a/src/Lumina.Excel/GeneratedSheets/ScenarioTreeTips.cs +++ b/src/Lumina.Excel/GeneratedSheets/ScenarioTreeTips.cs @@ -7,26 +7,22 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ScenarioTreeTips", columnHash: 0x71371b8c )] - public class ScenarioTreeTips : IExcelRow + public class ScenarioTreeTips : ExcelRow { - public byte Unknown0; - public uint Tips1; - public ushort Unknown2; - public LazyRow< ScenarioTree > Tips2; + public byte Unknown0 { get; set; } + public uint Tips1 { get; set; } + public ushort Unknown2 { get; set; } + public LazyRow< ScenarioTree > Tips2 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< byte >( 0 ); Tips1 = parser.ReadColumn< uint >( 1 ); Unknown2 = parser.ReadColumn< ushort >( 2 ); - Tips2 = new LazyRow< ScenarioTree >( lumina, parser.ReadColumn< uint >( 3 ), language ); + Tips2 = new LazyRow< ScenarioTree >( gameData, parser.ReadColumn< uint >( 3 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/ScenarioTreeTipsClassQuest.cs b/src/Lumina.Excel/GeneratedSheets/ScenarioTreeTipsClassQuest.cs index 3173a71d..1c33c219 100644 --- a/src/Lumina.Excel/GeneratedSheets/ScenarioTreeTipsClassQuest.cs +++ b/src/Lumina.Excel/GeneratedSheets/ScenarioTreeTipsClassQuest.cs @@ -7,28 +7,24 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ScenarioTreeTipsClassQuest", columnHash: 0xae1d30a7 )] - public class ScenarioTreeTipsClassQuest : IExcelRow + public class ScenarioTreeTipsClassQuest : ExcelRow { - public LazyRow< Quest > Quest; - public ushort RequiredLevel; - public LazyRow< ExVersion > RequiredExpansion; - public LazyRow< Quest > RequiredQuest; - public bool Unknown4; - public bool Unknown5; + public LazyRow< Quest > Quest { get; set; } + public ushort RequiredLevel { get; set; } + public LazyRow< ExVersion > RequiredExpansion { get; set; } + public LazyRow< Quest > RequiredQuest { get; set; } + public bool Unknown4 { get; set; } + public bool Unknown5 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Quest = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 0 ), language ); + Quest = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 0 ), language ); RequiredLevel = parser.ReadColumn< ushort >( 1 ); - RequiredExpansion = new LazyRow< ExVersion >( lumina, parser.ReadColumn< byte >( 2 ), language ); - RequiredQuest = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 3 ), language ); + RequiredExpansion = new LazyRow< ExVersion >( gameData, parser.ReadColumn< byte >( 2 ), language ); + RequiredQuest = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 3 ), language ); Unknown4 = parser.ReadColumn< bool >( 4 ); Unknown5 = parser.ReadColumn< bool >( 5 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/ScenarioType.cs b/src/Lumina.Excel/GeneratedSheets/ScenarioType.cs index 13f4986f..dc56371c 100644 --- a/src/Lumina.Excel/GeneratedSheets/ScenarioType.cs +++ b/src/Lumina.Excel/GeneratedSheets/ScenarioType.cs @@ -7,19 +7,15 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ScenarioType", columnHash: 0x9e3430e1 )] - public class ScenarioType : IExcelRow + public class ScenarioType : ExcelRow { - public SeString Type; - public sbyte Unknown1; + public SeString Type { get; set; } + public sbyte Unknown1 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Type = parser.ReadColumn< SeString >( 0 ); Unknown1 = parser.ReadColumn< sbyte >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/ScreenImage.cs b/src/Lumina.Excel/GeneratedSheets/ScreenImage.cs index a8c5a790..d8477833 100644 --- a/src/Lumina.Excel/GeneratedSheets/ScreenImage.cs +++ b/src/Lumina.Excel/GeneratedSheets/ScreenImage.cs @@ -7,21 +7,17 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ScreenImage", columnHash: 0xf03c70eb )] - public class ScreenImage : IExcelRow + public class ScreenImage : ExcelRow { - public uint Image; - public short Jingle; - public sbyte Type; - public bool Lang; + public uint Image { get; set; } + public short Jingle { get; set; } + public sbyte Type { get; set; } + public bool Lang { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Image = parser.ReadColumn< uint >( 0 ); Jingle = parser.ReadColumn< short >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/SecretRecipeBook.cs b/src/Lumina.Excel/GeneratedSheets/SecretRecipeBook.cs index 07f3024a..35e2d8a7 100644 --- a/src/Lumina.Excel/GeneratedSheets/SecretRecipeBook.cs +++ b/src/Lumina.Excel/GeneratedSheets/SecretRecipeBook.cs @@ -7,21 +7,17 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "SecretRecipeBook", columnHash: 0x0c8db36c )] - public class SecretRecipeBook : IExcelRow + public class SecretRecipeBook : ExcelRow { - public LazyRow< Item > Item; - public SeString Name; + public LazyRow< Item > Item { get; set; } + public SeString Name { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Item = new LazyRow< Item >( lumina, parser.ReadColumn< int >( 0 ), language ); + Item = new LazyRow< Item >( gameData, parser.ReadColumn< int >( 0 ), language ); Name = parser.ReadColumn< SeString >( 1 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/SkyIsland2Mission.cs b/src/Lumina.Excel/GeneratedSheets/SkyIsland2Mission.cs index df95e8ad..1178efb8 100644 --- a/src/Lumina.Excel/GeneratedSheets/SkyIsland2Mission.cs +++ b/src/Lumina.Excel/GeneratedSheets/SkyIsland2Mission.cs @@ -7,59 +7,55 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "SkyIsland2Mission", columnHash: 0xec50a29c )] - public class SkyIsland2Mission : IExcelRow + public class SkyIsland2Mission : ExcelRow { - public LazyRow< EventItem > Item1; - public LazyRow< EventItem > Item2; - public LazyRow< PlaceName > PlaceName; - public ushort Unknown3; - public LazyRow< SkyIsland2MissionDetail > Objective1; - public uint PopRange0; - public byte RequiredAmount1; - public uint Unknown7; - public byte Unknown8; - public LazyRow< SkyIsland2MissionDetail > Objective2; - public uint PopRange1; - public byte RequiredAmount2; - public uint Unknown12; - public byte Unknown13; - public LazyRow< SkyIsland2MissionDetail > Objective3; - public uint PopRange2; - public byte Unknown16; - public uint Unknown17; - public byte Unknown18; - public uint Unknown19; - public uint Image; - public SeString Unknown21; - public SeString Unknown22; - public SeString Unknown23; - public SeString Unknown24; - public SeString Unknown25; + public LazyRow< EventItem > Item1 { get; set; } + public LazyRow< EventItem > Item2 { get; set; } + public LazyRow< PlaceName > PlaceName { get; set; } + public ushort Unknown3 { get; set; } + public LazyRow< SkyIsland2MissionDetail > Objective1 { get; set; } + public uint PopRange0 { get; set; } + public byte RequiredAmount1 { get; set; } + public uint Unknown7 { get; set; } + public byte Unknown8 { get; set; } + public LazyRow< SkyIsland2MissionDetail > Objective2 { get; set; } + public uint PopRange1 { get; set; } + public byte RequiredAmount2 { get; set; } + public uint Unknown12 { get; set; } + public byte Unknown13 { get; set; } + public LazyRow< SkyIsland2MissionDetail > Objective3 { get; set; } + public uint PopRange2 { get; set; } + public byte Unknown16 { get; set; } + public uint Unknown17 { get; set; } + public byte Unknown18 { get; set; } + public uint Unknown19 { get; set; } + public uint Image { get; set; } + public SeString Unknown21 { get; set; } + public SeString Unknown22 { get; set; } + public SeString Unknown23 { get; set; } + public SeString Unknown24 { get; set; } + public SeString Unknown25 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Item1 = new LazyRow< EventItem >( lumina, parser.ReadColumn< uint >( 0 ), language ); - Item2 = new LazyRow< EventItem >( lumina, parser.ReadColumn< uint >( 1 ), language ); - PlaceName = new LazyRow< PlaceName >( lumina, parser.ReadColumn< ushort >( 2 ), language ); + Item1 = new LazyRow< EventItem >( gameData, parser.ReadColumn< uint >( 0 ), language ); + Item2 = new LazyRow< EventItem >( gameData, parser.ReadColumn< uint >( 1 ), language ); + PlaceName = new LazyRow< PlaceName >( gameData, parser.ReadColumn< ushort >( 2 ), language ); Unknown3 = parser.ReadColumn< ushort >( 3 ); - Objective1 = new LazyRow< SkyIsland2MissionDetail >( lumina, parser.ReadColumn< ushort >( 4 ), language ); + Objective1 = new LazyRow< SkyIsland2MissionDetail >( gameData, parser.ReadColumn< ushort >( 4 ), language ); PopRange0 = parser.ReadColumn< uint >( 5 ); RequiredAmount1 = parser.ReadColumn< byte >( 6 ); Unknown7 = parser.ReadColumn< uint >( 7 ); Unknown8 = parser.ReadColumn< byte >( 8 ); - Objective2 = new LazyRow< SkyIsland2MissionDetail >( lumina, parser.ReadColumn< ushort >( 9 ), language ); + Objective2 = new LazyRow< SkyIsland2MissionDetail >( gameData, parser.ReadColumn< ushort >( 9 ), language ); PopRange1 = parser.ReadColumn< uint >( 10 ); RequiredAmount2 = parser.ReadColumn< byte >( 11 ); Unknown12 = parser.ReadColumn< uint >( 12 ); Unknown13 = parser.ReadColumn< byte >( 13 ); - Objective3 = new LazyRow< SkyIsland2MissionDetail >( lumina, parser.ReadColumn< ushort >( 14 ), language ); + Objective3 = new LazyRow< SkyIsland2MissionDetail >( gameData, parser.ReadColumn< ushort >( 14 ), language ); PopRange2 = parser.ReadColumn< uint >( 15 ); Unknown16 = parser.ReadColumn< byte >( 16 ); Unknown17 = parser.ReadColumn< uint >( 17 ); diff --git a/src/Lumina.Excel/GeneratedSheets/SkyIsland2MissionDetail.cs b/src/Lumina.Excel/GeneratedSheets/SkyIsland2MissionDetail.cs index 5fe98c08..a7786349 100644 --- a/src/Lumina.Excel/GeneratedSheets/SkyIsland2MissionDetail.cs +++ b/src/Lumina.Excel/GeneratedSheets/SkyIsland2MissionDetail.cs @@ -7,34 +7,30 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "SkyIsland2MissionDetail", columnHash: 0x62246edb )] - public class SkyIsland2MissionDetail : IExcelRow + public class SkyIsland2MissionDetail : ExcelRow { - public LazyRow< SkyIsland2MissionType > Type; - public byte Unknown1; - public LazyRow< SkyIsland2RangeType > Range; - public sbyte Unknown3; - public LazyRow< EObjName > EObj; - public uint Unknown5; - public uint Unknown6; - public SeString Objective; - public SeString Unknown8; - public SeString Unknown9; - public SeString Unknown10; + public LazyRow< SkyIsland2MissionType > Type { get; set; } + public byte Unknown1 { get; set; } + public LazyRow< SkyIsland2RangeType > Range { get; set; } + public sbyte Unknown3 { get; set; } + public LazyRow< EObjName > EObj { get; set; } + public uint Unknown5 { get; set; } + public uint Unknown6 { get; set; } + public SeString Objective { get; set; } + public SeString Unknown8 { get; set; } + public SeString Unknown9 { get; set; } + public SeString Unknown10 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Type = new LazyRow< SkyIsland2MissionType >( lumina, parser.ReadColumn< byte >( 0 ), language ); + Type = new LazyRow< SkyIsland2MissionType >( gameData, parser.ReadColumn< byte >( 0 ), language ); Unknown1 = parser.ReadColumn< byte >( 1 ); - Range = new LazyRow< SkyIsland2RangeType >( lumina, parser.ReadColumn< byte >( 2 ), language ); + Range = new LazyRow< SkyIsland2RangeType >( gameData, parser.ReadColumn< byte >( 2 ), language ); Unknown3 = parser.ReadColumn< sbyte >( 3 ); - EObj = new LazyRow< EObjName >( lumina, parser.ReadColumn< uint >( 4 ), language ); + EObj = new LazyRow< EObjName >( gameData, parser.ReadColumn< uint >( 4 ), language ); Unknown5 = parser.ReadColumn< uint >( 5 ); Unknown6 = parser.ReadColumn< uint >( 6 ); Objective = parser.ReadColumn< SeString >( 7 ); diff --git a/src/Lumina.Excel/GeneratedSheets/SkyIsland2MissionType.cs b/src/Lumina.Excel/GeneratedSheets/SkyIsland2MissionType.cs index cc633ac1..b0ca7401 100644 --- a/src/Lumina.Excel/GeneratedSheets/SkyIsland2MissionType.cs +++ b/src/Lumina.Excel/GeneratedSheets/SkyIsland2MissionType.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "SkyIsland2MissionType", columnHash: 0xcd4cb81c )] - public class SkyIsland2MissionType : IExcelRow + public class SkyIsland2MissionType : ExcelRow { - public bool Type; + public bool Type { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Type = parser.ReadColumn< bool >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/SkyIsland2RangeType.cs b/src/Lumina.Excel/GeneratedSheets/SkyIsland2RangeType.cs index 5621f0e5..22ef1023 100644 --- a/src/Lumina.Excel/GeneratedSheets/SkyIsland2RangeType.cs +++ b/src/Lumina.Excel/GeneratedSheets/SkyIsland2RangeType.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "SkyIsland2RangeType", columnHash: 0xdcfd9eba )] - public class SkyIsland2RangeType : IExcelRow + public class SkyIsland2RangeType : ExcelRow { - public byte Type; + public byte Type { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Type = parser.ReadColumn< byte >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/SnipeTalk.cs b/src/Lumina.Excel/GeneratedSheets/SnipeTalk.cs index 67b17107..242c865b 100644 --- a/src/Lumina.Excel/GeneratedSheets/SnipeTalk.cs +++ b/src/Lumina.Excel/GeneratedSheets/SnipeTalk.cs @@ -7,27 +7,23 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "SnipeTalk", columnHash: 0xcea69cac )] - public class SnipeTalk : IExcelRow + public class SnipeTalk : ExcelRow { - public byte Unknown0; - public byte Unknown1; - public LazyRow< SnipeTalkName > Name; - public SeString Text; - public SeString Unknown4; - public SeString Unknown5; + public byte Unknown0 { get; set; } + public byte Unknown1 { get; set; } + public LazyRow< SnipeTalkName > Name { get; set; } + public SeString Text { get; set; } + public SeString Unknown4 { get; set; } + public SeString Unknown5 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< byte >( 0 ); Unknown1 = parser.ReadColumn< byte >( 1 ); - Name = new LazyRow< SnipeTalkName >( lumina, parser.ReadColumn< ushort >( 2 ), language ); + Name = new LazyRow< SnipeTalkName >( gameData, parser.ReadColumn< ushort >( 2 ), language ); Text = parser.ReadColumn< SeString >( 3 ); Unknown4 = parser.ReadColumn< SeString >( 4 ); Unknown5 = parser.ReadColumn< SeString >( 5 ); diff --git a/src/Lumina.Excel/GeneratedSheets/SnipeTalkName.cs b/src/Lumina.Excel/GeneratedSheets/SnipeTalkName.cs index 6321e3d2..27b76797 100644 --- a/src/Lumina.Excel/GeneratedSheets/SnipeTalkName.cs +++ b/src/Lumina.Excel/GeneratedSheets/SnipeTalkName.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "SnipeTalkName", columnHash: 0xdebb20e3 )] - public class SnipeTalkName : IExcelRow + public class SnipeTalkName : ExcelRow { - public SeString Name; + public SeString Name { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/SpearfishingItem.cs b/src/Lumina.Excel/GeneratedSheets/SpearfishingItem.cs index 3be0b9a5..e90a2958 100644 --- a/src/Lumina.Excel/GeneratedSheets/SpearfishingItem.cs +++ b/src/Lumina.Excel/GeneratedSheets/SpearfishingItem.cs @@ -7,29 +7,25 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "SpearfishingItem", columnHash: 0xd17632b4 )] - public class SpearfishingItem : IExcelRow + public class SpearfishingItem : ExcelRow { - public SeString Description; - public LazyRow< Item > Item; - public LazyRow< GatheringItemLevelConvertTable > GatheringItemLevel; - public LazyRow< FishingRecordType > FishingRecordType; - public LazyRow< TerritoryType > TerritoryType; - public bool IsVisible; + public SeString Description { get; set; } + public LazyRow< Item > Item { get; set; } + public LazyRow< GatheringItemLevelConvertTable > GatheringItemLevel { get; set; } + public LazyRow< FishingRecordType > FishingRecordType { get; set; } + public LazyRow< TerritoryType > TerritoryType { get; set; } + public bool IsVisible { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Description = parser.ReadColumn< SeString >( 0 ); - Item = new LazyRow< Item >( lumina, parser.ReadColumn< int >( 1 ), language ); - GatheringItemLevel = new LazyRow< GatheringItemLevelConvertTable >( lumina, parser.ReadColumn< ushort >( 2 ), language ); - FishingRecordType = new LazyRow< FishingRecordType >( lumina, parser.ReadColumn< byte >( 3 ), language ); - TerritoryType = new LazyRow< TerritoryType >( lumina, parser.ReadColumn< ushort >( 4 ), language ); + Item = new LazyRow< Item >( gameData, parser.ReadColumn< int >( 1 ), language ); + GatheringItemLevel = new LazyRow< GatheringItemLevelConvertTable >( gameData, parser.ReadColumn< ushort >( 2 ), language ); + FishingRecordType = new LazyRow< FishingRecordType >( gameData, parser.ReadColumn< byte >( 3 ), language ); + TerritoryType = new LazyRow< TerritoryType >( gameData, parser.ReadColumn< ushort >( 4 ), language ); IsVisible = parser.ReadColumn< bool >( 5 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/SpearfishingNotebook.cs b/src/Lumina.Excel/GeneratedSheets/SpearfishingNotebook.cs index a0f30581..b4b77281 100644 --- a/src/Lumina.Excel/GeneratedSheets/SpearfishingNotebook.cs +++ b/src/Lumina.Excel/GeneratedSheets/SpearfishingNotebook.cs @@ -7,40 +7,36 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "SpearfishingNotebook", columnHash: 0x0f196a4a )] - public class SpearfishingNotebook : IExcelRow + public class SpearfishingNotebook : ExcelRow { - public byte GatheringLevel; - public bool Unknown1; - public LazyRow< TerritoryType > TerritoryType; - public short X; - public short Y; - public ushort Radius; - public byte Unknown6; - public LazyRow< PlaceName > PlaceName; - public byte Unknown8; - public LazyRow< GatheringPointBase > GatheringPointBase; - public ushort Unknown10; - public ushort Unknown11; + public byte GatheringLevel { get; set; } + public bool Unknown1 { get; set; } + public LazyRow< TerritoryType > TerritoryType { get; set; } + public short X { get; set; } + public short Y { get; set; } + public ushort Radius { get; set; } + public byte Unknown6 { get; set; } + public LazyRow< PlaceName > PlaceName { get; set; } + public byte Unknown8 { get; set; } + public LazyRow< GatheringPointBase > GatheringPointBase { get; set; } + public ushort Unknown10 { get; set; } + public ushort Unknown11 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); GatheringLevel = parser.ReadColumn< byte >( 0 ); Unknown1 = parser.ReadColumn< bool >( 1 ); - TerritoryType = new LazyRow< TerritoryType >( lumina, parser.ReadColumn< int >( 2 ), language ); + TerritoryType = new LazyRow< TerritoryType >( gameData, parser.ReadColumn< int >( 2 ), language ); X = parser.ReadColumn< short >( 3 ); Y = parser.ReadColumn< short >( 4 ); Radius = parser.ReadColumn< ushort >( 5 ); Unknown6 = parser.ReadColumn< byte >( 6 ); - PlaceName = new LazyRow< PlaceName >( lumina, parser.ReadColumn< ushort >( 7 ), language ); + PlaceName = new LazyRow< PlaceName >( gameData, parser.ReadColumn< ushort >( 7 ), language ); Unknown8 = parser.ReadColumn< byte >( 8 ); - GatheringPointBase = new LazyRow< GatheringPointBase >( lumina, parser.ReadColumn< ushort >( 9 ), language ); + GatheringPointBase = new LazyRow< GatheringPointBase >( gameData, parser.ReadColumn< ushort >( 9 ), language ); Unknown10 = parser.ReadColumn< ushort >( 10 ); Unknown11 = parser.ReadColumn< ushort >( 11 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/SpearfishingRecordPage.cs b/src/Lumina.Excel/GeneratedSheets/SpearfishingRecordPage.cs index d913562a..69ef2969 100644 --- a/src/Lumina.Excel/GeneratedSheets/SpearfishingRecordPage.cs +++ b/src/Lumina.Excel/GeneratedSheets/SpearfishingRecordPage.cs @@ -7,27 +7,23 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "SpearfishingRecordPage", columnHash: 0x4f78acda )] - public class SpearfishingRecordPage : IExcelRow + public class SpearfishingRecordPage : ExcelRow { - public byte Unknown0; - public byte Unknown1; - public byte Unknown2; - public LazyRow< PlaceName > PlaceName; - public int Image; + public byte Unknown0 { get; set; } + public byte Unknown1 { get; set; } + public byte Unknown2 { get; set; } + public LazyRow< PlaceName > PlaceName { get; set; } + public int Image { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< byte >( 0 ); Unknown1 = parser.ReadColumn< byte >( 1 ); Unknown2 = parser.ReadColumn< byte >( 2 ); - PlaceName = new LazyRow< PlaceName >( lumina, parser.ReadColumn< int >( 3 ), language ); + PlaceName = new LazyRow< PlaceName >( gameData, parser.ReadColumn< int >( 3 ), language ); Image = parser.ReadColumn< int >( 4 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/SpecialShop.cs b/src/Lumina.Excel/GeneratedSheets/SpecialShop.cs index 830cb307..2b0ef6a6 100644 --- a/src/Lumina.Excel/GeneratedSheets/SpecialShop.cs +++ b/src/Lumina.Excel/GeneratedSheets/SpecialShop.cs @@ -7,7 +7,7 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "SpecialShop", columnHash: 0x86d645dc )] - public class SpecialShop : IExcelRow + public class SpecialShop : ExcelRow { public struct UnkStruct1Struct { @@ -24,1267 +24,1263 @@ public struct UnkStruct481Struct public int CollectabilityRatingCost; } - public SeString Name; - public UnkStruct1Struct[] UnkStruct1; - public int Unknown9; - public int Unknown10; - public int Unknown11; - public int Unknown12; - public int Unknown13; - public int Unknown14; - public int Unknown15; - public int Unknown16; - public int Unknown17; - public int Unknown18; - public int Unknown19; - public int Unknown20; - public int Unknown21; - public int Unknown22; - public int Unknown23; - public int Unknown24; - public int Unknown25; - public int Unknown26; - public int Unknown27; - public int Unknown28; - public int Unknown29; - public int Unknown30; - public int Unknown31; - public int Unknown32; - public int Unknown33; - public int Unknown34; - public int Unknown35; - public int Unknown36; - public int Unknown37; - public int Unknown38; - public int Unknown39; - public int Unknown40; - public int Unknown41; - public int Unknown42; - public int Unknown43; - public int Unknown44; - public int Unknown45; - public int Unknown46; - public int Unknown47; - public int Unknown48; - public int Unknown49; - public int Unknown50; - public int Unknown51; - public int Unknown52; - public int Unknown53; - public int Unknown54; - public int Unknown55; - public int Unknown56; - public int Unknown57; - public int Unknown58; - public int Unknown59; - public int Unknown60; - public uint Unknown61; - public uint Unknown62; - public uint Unknown63; - public uint Unknown64; - public uint Unknown65; - public uint Unknown66; - public uint Unknown67; - public uint Unknown68; - public uint Unknown69; - public uint Unknown70; - public uint Unknown71; - public uint Unknown72; - public uint Unknown73; - public uint Unknown74; - public uint Unknown75; - public uint Unknown76; - public uint Unknown77; - public uint Unknown78; - public uint Unknown79; - public uint Unknown80; - public uint Unknown81; - public uint Unknown82; - public uint Unknown83; - public uint Unknown84; - public uint Unknown85; - public uint Unknown86; - public uint Unknown87; - public uint Unknown88; - public uint Unknown89; - public uint Unknown90; - public uint Unknown91; - public uint Unknown92; - public uint Unknown93; - public uint Unknown94; - public uint Unknown95; - public uint Unknown96; - public uint Unknown97; - public uint Unknown98; - public uint Unknown99; - public uint Unknown100; - public uint Unknown101; - public uint Unknown102; - public uint Unknown103; - public uint Unknown104; - public uint Unknown105; - public uint Unknown106; - public uint Unknown107; - public uint Unknown108; - public uint Unknown109; - public uint Unknown110; - public uint Unknown111; - public uint Unknown112; - public uint Unknown113; - public uint Unknown114; - public uint Unknown115; - public uint Unknown116; - public uint Unknown117; - public uint Unknown118; - public uint Unknown119; - public uint Unknown120; - public int Unknown121; - public int Unknown122; - public int Unknown123; - public int Unknown124; - public int Unknown125; - public int Unknown126; - public int Unknown127; - public int Unknown128; - public int Unknown129; - public int Unknown130; - public int Unknown131; - public int Unknown132; - public int Unknown133; - public int Unknown134; - public int Unknown135; - public int Unknown136; - public int Unknown137; - public int Unknown138; - public int Unknown139; - public int Unknown140; - public int Unknown141; - public int Unknown142; - public int Unknown143; - public int Unknown144; - public int Unknown145; - public int Unknown146; - public int Unknown147; - public int Unknown148; - public int Unknown149; - public int Unknown150; - public int Unknown151; - public int Unknown152; - public int Unknown153; - public int Unknown154; - public int Unknown155; - public int Unknown156; - public int Unknown157; - public int Unknown158; - public int Unknown159; - public int Unknown160; - public int Unknown161; - public int Unknown162; - public int Unknown163; - public int Unknown164; - public int Unknown165; - public int Unknown166; - public int Unknown167; - public int Unknown168; - public int Unknown169; - public int Unknown170; - public int Unknown171; - public int Unknown172; - public int Unknown173; - public int Unknown174; - public int Unknown175; - public int Unknown176; - public int Unknown177; - public int Unknown178; - public int Unknown179; - public int Unknown180; - public bool Unknown181; - public bool Unknown182; - public bool Unknown183; - public bool Unknown184; - public bool Unknown185; - public bool Unknown186; - public bool Unknown187; - public bool Unknown188; - public bool Unknown189; - public bool Unknown190; - public bool Unknown191; - public bool Unknown192; - public bool Unknown193; - public bool Unknown194; - public bool Unknown195; - public bool Unknown196; - public bool Unknown197; - public bool Unknown198; - public bool Unknown199; - public bool Unknown200; - public bool Unknown201; - public bool Unknown202; - public bool Unknown203; - public bool Unknown204; - public bool Unknown205; - public bool Unknown206; - public bool Unknown207; - public bool Unknown208; - public bool Unknown209; - public bool Unknown210; - public bool Unknown211; - public bool Unknown212; - public bool Unknown213; - public bool Unknown214; - public bool Unknown215; - public bool Unknown216; - public bool Unknown217; - public bool Unknown218; - public bool Unknown219; - public bool Unknown220; - public bool Unknown221; - public bool Unknown222; - public bool Unknown223; - public bool Unknown224; - public bool Unknown225; - public bool Unknown226; - public bool Unknown227; - public bool Unknown228; - public bool Unknown229; - public bool Unknown230; - public bool Unknown231; - public bool Unknown232; - public bool Unknown233; - public bool Unknown234; - public bool Unknown235; - public bool Unknown236; - public bool Unknown237; - public bool Unknown238; - public bool Unknown239; - public bool Unknown240; - public int Unknown241; - public int Unknown242; - public int Unknown243; - public int Unknown244; - public int Unknown245; - public int Unknown246; - public int Unknown247; - public int Unknown248; - public int Unknown249; - public int Unknown250; - public int Unknown251; - public int Unknown252; - public int Unknown253; - public int Unknown254; - public int Unknown255; - public int Unknown256; - public int Unknown257; - public int Unknown258; - public int Unknown259; - public int Unknown260; - public int Unknown261; - public int Unknown262; - public int Unknown263; - public int Unknown264; - public int Unknown265; - public int Unknown266; - public int Unknown267; - public int Unknown268; - public int Unknown269; - public int Unknown270; - public int Unknown271; - public int Unknown272; - public int Unknown273; - public int Unknown274; - public int Unknown275; - public int Unknown276; - public int Unknown277; - public int Unknown278; - public int Unknown279; - public int Unknown280; - public int Unknown281; - public int Unknown282; - public int Unknown283; - public int Unknown284; - public int Unknown285; - public int Unknown286; - public int Unknown287; - public int Unknown288; - public int Unknown289; - public int Unknown290; - public int Unknown291; - public int Unknown292; - public int Unknown293; - public int Unknown294; - public int Unknown295; - public int Unknown296; - public int Unknown297; - public int Unknown298; - public int Unknown299; - public int Unknown300; - public uint Unknown301; - public uint Unknown302; - public uint Unknown303; - public uint Unknown304; - public uint Unknown305; - public uint Unknown306; - public uint Unknown307; - public uint Unknown308; - public uint Unknown309; - public uint Unknown310; - public uint Unknown311; - public uint Unknown312; - public uint Unknown313; - public uint Unknown314; - public uint Unknown315; - public uint Unknown316; - public uint Unknown317; - public uint Unknown318; - public uint Unknown319; - public uint Unknown320; - public uint Unknown321; - public uint Unknown322; - public uint Unknown323; - public uint Unknown324; - public uint Unknown325; - public uint Unknown326; - public uint Unknown327; - public uint Unknown328; - public uint Unknown329; - public uint Unknown330; - public uint Unknown331; - public uint Unknown332; - public uint Unknown333; - public uint Unknown334; - public uint Unknown335; - public uint Unknown336; - public uint Unknown337; - public uint Unknown338; - public uint Unknown339; - public uint Unknown340; - public uint Unknown341; - public uint Unknown342; - public uint Unknown343; - public uint Unknown344; - public uint Unknown345; - public uint Unknown346; - public uint Unknown347; - public uint Unknown348; - public uint Unknown349; - public uint Unknown350; - public uint Unknown351; - public uint Unknown352; - public uint Unknown353; - public uint Unknown354; - public uint Unknown355; - public uint Unknown356; - public uint Unknown357; - public uint Unknown358; - public uint Unknown359; - public uint Unknown360; - public int Unknown361; - public int Unknown362; - public int Unknown363; - public int Unknown364; - public int Unknown365; - public int Unknown366; - public int Unknown367; - public int Unknown368; - public int Unknown369; - public int Unknown370; - public int Unknown371; - public int Unknown372; - public int Unknown373; - public int Unknown374; - public int Unknown375; - public int Unknown376; - public int Unknown377; - public int Unknown378; - public int Unknown379; - public int Unknown380; - public int Unknown381; - public int Unknown382; - public int Unknown383; - public int Unknown384; - public int Unknown385; - public int Unknown386; - public int Unknown387; - public int Unknown388; - public int Unknown389; - public int Unknown390; - public int Unknown391; - public int Unknown392; - public int Unknown393; - public int Unknown394; - public int Unknown395; - public int Unknown396; - public int Unknown397; - public int Unknown398; - public int Unknown399; - public int Unknown400; - public int Unknown401; - public int Unknown402; - public int Unknown403; - public int Unknown404; - public int Unknown405; - public int Unknown406; - public int Unknown407; - public int Unknown408; - public int Unknown409; - public int Unknown410; - public int Unknown411; - public int Unknown412; - public int Unknown413; - public int Unknown414; - public int Unknown415; - public int Unknown416; - public int Unknown417; - public int Unknown418; - public int Unknown419; - public int Unknown420; - public bool Unknown421; - public bool Unknown422; - public bool Unknown423; - public bool Unknown424; - public bool Unknown425; - public bool Unknown426; - public bool Unknown427; - public bool Unknown428; - public bool Unknown429; - public bool Unknown430; - public bool Unknown431; - public bool Unknown432; - public bool Unknown433; - public bool Unknown434; - public bool Unknown435; - public bool Unknown436; - public bool Unknown437; - public bool Unknown438; - public bool Unknown439; - public bool Unknown440; - public bool Unknown441; - public bool Unknown442; - public bool Unknown443; - public bool Unknown444; - public bool Unknown445; - public bool Unknown446; - public bool Unknown447; - public bool Unknown448; - public bool Unknown449; - public bool Unknown450; - public bool Unknown451; - public bool Unknown452; - public bool Unknown453; - public bool Unknown454; - public bool Unknown455; - public bool Unknown456; - public bool Unknown457; - public bool Unknown458; - public bool Unknown459; - public bool Unknown460; - public bool Unknown461; - public bool Unknown462; - public bool Unknown463; - public bool Unknown464; - public bool Unknown465; - public bool Unknown466; - public bool Unknown467; - public bool Unknown468; - public bool Unknown469; - public bool Unknown470; - public bool Unknown471; - public bool Unknown472; - public bool Unknown473; - public bool Unknown474; - public bool Unknown475; - public bool Unknown476; - public bool Unknown477; - public bool Unknown478; - public bool Unknown479; - public bool Unknown480; - public UnkStruct481Struct[] UnkStruct481; - public int Unknown493; - public int Unknown494; - public int Unknown495; - public int Unknown496; - public int Unknown497; - public int Unknown498; - public int Unknown499; - public int Unknown500; - public int Unknown501; - public int Unknown502; - public int Unknown503; - public int Unknown504; - public int Unknown505; - public int Unknown506; - public int Unknown507; - public int Unknown508; - public int Unknown509; - public int Unknown510; - public int Unknown511; - public int Unknown512; - public int Unknown513; - public int Unknown514; - public int Unknown515; - public int Unknown516; - public int Unknown517; - public int Unknown518; - public int Unknown519; - public int Unknown520; - public int Unknown521; - public int Unknown522; - public int Unknown523; - public int Unknown524; - public int Unknown525; - public int Unknown526; - public int Unknown527; - public int Unknown528; - public int Unknown529; - public int Unknown530; - public int Unknown531; - public int Unknown532; - public int Unknown533; - public int Unknown534; - public int Unknown535; - public int Unknown536; - public int Unknown537; - public int Unknown538; - public int Unknown539; - public int Unknown540; - public uint Unknown541; - public uint Unknown542; - public uint Unknown543; - public uint Unknown544; - public uint Unknown545; - public uint Unknown546; - public uint Unknown547; - public uint Unknown548; - public uint Unknown549; - public uint Unknown550; - public uint Unknown551; - public uint Unknown552; - public uint Unknown553; - public uint Unknown554; - public uint Unknown555; - public uint Unknown556; - public uint Unknown557; - public uint Unknown558; - public uint Unknown559; - public uint Unknown560; - public uint Unknown561; - public uint Unknown562; - public uint Unknown563; - public uint Unknown564; - public uint Unknown565; - public uint Unknown566; - public uint Unknown567; - public uint Unknown568; - public uint Unknown569; - public uint Unknown570; - public uint Unknown571; - public uint Unknown572; - public uint Unknown573; - public uint Unknown574; - public uint Unknown575; - public uint Unknown576; - public uint Unknown577; - public uint Unknown578; - public uint Unknown579; - public uint Unknown580; - public uint Unknown581; - public uint Unknown582; - public uint Unknown583; - public uint Unknown584; - public uint Unknown585; - public uint Unknown586; - public uint Unknown587; - public uint Unknown588; - public uint Unknown589; - public uint Unknown590; - public uint Unknown591; - public uint Unknown592; - public uint Unknown593; - public uint Unknown594; - public uint Unknown595; - public uint Unknown596; - public uint Unknown597; - public uint Unknown598; - public uint Unknown599; - public uint Unknown600; - public bool Unknown601; - public bool Unknown602; - public bool Unknown603; - public bool Unknown604; - public bool Unknown605; - public bool Unknown606; - public bool Unknown607; - public bool Unknown608; - public bool Unknown609; - public bool Unknown610; - public bool Unknown611; - public bool Unknown612; - public bool Unknown613; - public bool Unknown614; - public bool Unknown615; - public bool Unknown616; - public bool Unknown617; - public bool Unknown618; - public bool Unknown619; - public bool Unknown620; - public bool Unknown621; - public bool Unknown622; - public bool Unknown623; - public bool Unknown624; - public bool Unknown625; - public bool Unknown626; - public bool Unknown627; - public bool Unknown628; - public bool Unknown629; - public bool Unknown630; - public bool Unknown631; - public bool Unknown632; - public bool Unknown633; - public bool Unknown634; - public bool Unknown635; - public bool Unknown636; - public bool Unknown637; - public bool Unknown638; - public bool Unknown639; - public bool Unknown640; - public bool Unknown641; - public bool Unknown642; - public bool Unknown643; - public bool Unknown644; - public bool Unknown645; - public bool Unknown646; - public bool Unknown647; - public bool Unknown648; - public bool Unknown649; - public bool Unknown650; - public bool Unknown651; - public bool Unknown652; - public bool Unknown653; - public bool Unknown654; - public bool Unknown655; - public bool Unknown656; - public bool Unknown657; - public bool Unknown658; - public bool Unknown659; - public bool Unknown660; - public ushort Unknown661; - public ushort Unknown662; - public ushort Unknown663; - public ushort Unknown664; - public ushort Unknown665; - public ushort Unknown666; - public ushort Unknown667; - public ushort Unknown668; - public ushort Unknown669; - public ushort Unknown670; - public ushort Unknown671; - public ushort Unknown672; - public ushort Unknown673; - public ushort Unknown674; - public ushort Unknown675; - public ushort Unknown676; - public ushort Unknown677; - public ushort Unknown678; - public ushort Unknown679; - public ushort Unknown680; - public ushort Unknown681; - public ushort Unknown682; - public ushort Unknown683; - public ushort Unknown684; - public ushort Unknown685; - public ushort Unknown686; - public ushort Unknown687; - public ushort Unknown688; - public ushort Unknown689; - public ushort Unknown690; - public ushort Unknown691; - public ushort Unknown692; - public ushort Unknown693; - public ushort Unknown694; - public ushort Unknown695; - public ushort Unknown696; - public ushort Unknown697; - public ushort Unknown698; - public ushort Unknown699; - public ushort Unknown700; - public ushort Unknown701; - public ushort Unknown702; - public ushort Unknown703; - public ushort Unknown704; - public ushort Unknown705; - public ushort Unknown706; - public ushort Unknown707; - public ushort Unknown708; - public ushort Unknown709; - public ushort Unknown710; - public ushort Unknown711; - public ushort Unknown712; - public ushort Unknown713; - public ushort Unknown714; - public ushort Unknown715; - public ushort Unknown716; - public ushort Unknown717; - public ushort Unknown718; - public ushort Unknown719; - public ushort Unknown720; - public int Unknown721; - public int Unknown722; - public int Unknown723; - public int Unknown724; - public int Unknown725; - public int Unknown726; - public int Unknown727; - public int Unknown728; - public int Unknown729; - public int Unknown730; - public int Unknown731; - public int Unknown732; - public int Unknown733; - public int Unknown734; - public int Unknown735; - public int Unknown736; - public int Unknown737; - public int Unknown738; - public int Unknown739; - public int Unknown740; - public int Unknown741; - public int Unknown742; - public int Unknown743; - public int Unknown744; - public int Unknown745; - public int Unknown746; - public int Unknown747; - public int Unknown748; - public int Unknown749; - public int Unknown750; - public int Unknown751; - public int Unknown752; - public int Unknown753; - public int Unknown754; - public int Unknown755; - public int Unknown756; - public int Unknown757; - public int Unknown758; - public int Unknown759; - public int Unknown760; - public int Unknown761; - public int Unknown762; - public int Unknown763; - public int Unknown764; - public int Unknown765; - public int Unknown766; - public int Unknown767; - public int Unknown768; - public int Unknown769; - public int Unknown770; - public int Unknown771; - public int Unknown772; - public int Unknown773; - public int Unknown774; - public int Unknown775; - public int Unknown776; - public int Unknown777; - public int Unknown778; - public int Unknown779; - public int Unknown780; - public uint Unknown781; - public uint Unknown782; - public uint Unknown783; - public uint Unknown784; - public uint Unknown785; - public uint Unknown786; - public uint Unknown787; - public uint Unknown788; - public uint Unknown789; - public uint Unknown790; - public uint Unknown791; - public uint Unknown792; - public uint Unknown793; - public uint Unknown794; - public uint Unknown795; - public uint Unknown796; - public uint Unknown797; - public uint Unknown798; - public uint Unknown799; - public uint Unknown800; - public uint Unknown801; - public uint Unknown802; - public uint Unknown803; - public uint Unknown804; - public uint Unknown805; - public uint Unknown806; - public uint Unknown807; - public uint Unknown808; - public uint Unknown809; - public uint Unknown810; - public uint Unknown811; - public uint Unknown812; - public uint Unknown813; - public uint Unknown814; - public uint Unknown815; - public uint Unknown816; - public uint Unknown817; - public uint Unknown818; - public uint Unknown819; - public uint Unknown820; - public uint Unknown821; - public uint Unknown822; - public uint Unknown823; - public uint Unknown824; - public uint Unknown825; - public uint Unknown826; - public uint Unknown827; - public uint Unknown828; - public uint Unknown829; - public uint Unknown830; - public uint Unknown831; - public uint Unknown832; - public uint Unknown833; - public uint Unknown834; - public uint Unknown835; - public uint Unknown836; - public uint Unknown837; - public uint Unknown838; - public uint Unknown839; - public uint Unknown840; - public bool Unknown841; - public bool Unknown842; - public bool Unknown843; - public bool Unknown844; - public bool Unknown845; - public bool Unknown846; - public bool Unknown847; - public bool Unknown848; - public bool Unknown849; - public bool Unknown850; - public bool Unknown851; - public bool Unknown852; - public bool Unknown853; - public bool Unknown854; - public bool Unknown855; - public bool Unknown856; - public bool Unknown857; - public bool Unknown858; - public bool Unknown859; - public bool Unknown860; - public bool Unknown861; - public bool Unknown862; - public bool Unknown863; - public bool Unknown864; - public bool Unknown865; - public bool Unknown866; - public bool Unknown867; - public bool Unknown868; - public bool Unknown869; - public bool Unknown870; - public bool Unknown871; - public bool Unknown872; - public bool Unknown873; - public bool Unknown874; - public bool Unknown875; - public bool Unknown876; - public bool Unknown877; - public bool Unknown878; - public bool Unknown879; - public bool Unknown880; - public bool Unknown881; - public bool Unknown882; - public bool Unknown883; - public bool Unknown884; - public bool Unknown885; - public bool Unknown886; - public bool Unknown887; - public bool Unknown888; - public bool Unknown889; - public bool Unknown890; - public bool Unknown891; - public bool Unknown892; - public bool Unknown893; - public bool Unknown894; - public bool Unknown895; - public bool Unknown896; - public bool Unknown897; - public bool Unknown898; - public bool Unknown899; - public bool Unknown900; - public ushort Unknown901; - public ushort Unknown902; - public ushort Unknown903; - public ushort Unknown904; - public ushort Unknown905; - public ushort Unknown906; - public ushort Unknown907; - public ushort Unknown908; - public ushort Unknown909; - public ushort Unknown910; - public ushort Unknown911; - public ushort Unknown912; - public ushort Unknown913; - public ushort Unknown914; - public ushort Unknown915; - public ushort Unknown916; - public ushort Unknown917; - public ushort Unknown918; - public ushort Unknown919; - public ushort Unknown920; - public ushort Unknown921; - public ushort Unknown922; - public ushort Unknown923; - public ushort Unknown924; - public ushort Unknown925; - public ushort Unknown926; - public ushort Unknown927; - public ushort Unknown928; - public ushort Unknown929; - public ushort Unknown930; - public ushort Unknown931; - public ushort Unknown932; - public ushort Unknown933; - public ushort Unknown934; - public ushort Unknown935; - public ushort Unknown936; - public ushort Unknown937; - public ushort Unknown938; - public ushort Unknown939; - public ushort Unknown940; - public ushort Unknown941; - public ushort Unknown942; - public ushort Unknown943; - public ushort Unknown944; - public ushort Unknown945; - public ushort Unknown946; - public ushort Unknown947; - public ushort Unknown948; - public ushort Unknown949; - public ushort Unknown950; - public ushort Unknown951; - public ushort Unknown952; - public ushort Unknown953; - public ushort Unknown954; - public ushort Unknown955; - public ushort Unknown956; - public ushort Unknown957; - public ushort Unknown958; - public ushort Unknown959; - public ushort Unknown960; - public int Unknown961; - public int Unknown962; - public int Unknown963; - public int Unknown964; - public int Unknown965; - public int Unknown966; - public int Unknown967; - public int Unknown968; - public int Unknown969; - public int Unknown970; - public int Unknown971; - public int Unknown972; - public int Unknown973; - public int Unknown974; - public int Unknown975; - public int Unknown976; - public int Unknown977; - public int Unknown978; - public int Unknown979; - public int Unknown980; - public int Unknown981; - public int Unknown982; - public int Unknown983; - public int Unknown984; - public int Unknown985; - public int Unknown986; - public int Unknown987; - public int Unknown988; - public int Unknown989; - public int Unknown990; - public int Unknown991; - public int Unknown992; - public int Unknown993; - public int Unknown994; - public int Unknown995; - public int Unknown996; - public int Unknown997; - public int Unknown998; - public int Unknown999; - public int Unknown1000; - public int Unknown1001; - public int Unknown1002; - public int Unknown1003; - public int Unknown1004; - public int Unknown1005; - public int Unknown1006; - public int Unknown1007; - public int Unknown1008; - public int Unknown1009; - public int Unknown1010; - public int Unknown1011; - public int Unknown1012; - public int Unknown1013; - public int Unknown1014; - public int Unknown1015; - public int Unknown1016; - public int Unknown1017; - public int Unknown1018; - public int Unknown1019; - public int Unknown1020; - public uint Unknown1021; - public uint Unknown1022; - public uint Unknown1023; - public uint Unknown1024; - public uint Unknown1025; - public uint Unknown1026; - public uint Unknown1027; - public uint Unknown1028; - public uint Unknown1029; - public uint Unknown1030; - public uint Unknown1031; - public uint Unknown1032; - public uint Unknown1033; - public uint Unknown1034; - public uint Unknown1035; - public uint Unknown1036; - public uint Unknown1037; - public uint Unknown1038; - public uint Unknown1039; - public uint Unknown1040; - public uint Unknown1041; - public uint Unknown1042; - public uint Unknown1043; - public uint Unknown1044; - public uint Unknown1045; - public uint Unknown1046; - public uint Unknown1047; - public uint Unknown1048; - public uint Unknown1049; - public uint Unknown1050; - public uint Unknown1051; - public uint Unknown1052; - public uint Unknown1053; - public uint Unknown1054; - public uint Unknown1055; - public uint Unknown1056; - public uint Unknown1057; - public uint Unknown1058; - public uint Unknown1059; - public uint Unknown1060; - public uint Unknown1061; - public uint Unknown1062; - public uint Unknown1063; - public uint Unknown1064; - public uint Unknown1065; - public uint Unknown1066; - public uint Unknown1067; - public uint Unknown1068; - public uint Unknown1069; - public uint Unknown1070; - public uint Unknown1071; - public uint Unknown1072; - public uint Unknown1073; - public uint Unknown1074; - public uint Unknown1075; - public uint Unknown1076; - public uint Unknown1077; - public uint Unknown1078; - public uint Unknown1079; - public uint Unknown1080; - public bool Unknown1081; - public bool Unknown1082; - public bool Unknown1083; - public bool Unknown1084; - public bool Unknown1085; - public bool Unknown1086; - public bool Unknown1087; - public bool Unknown1088; - public bool Unknown1089; - public bool Unknown1090; - public bool Unknown1091; - public bool Unknown1092; - public bool Unknown1093; - public bool Unknown1094; - public bool Unknown1095; - public bool Unknown1096; - public bool Unknown1097; - public bool Unknown1098; - public bool Unknown1099; - public bool Unknown1100; - public bool Unknown1101; - public bool Unknown1102; - public bool Unknown1103; - public bool Unknown1104; - public bool Unknown1105; - public bool Unknown1106; - public bool Unknown1107; - public bool Unknown1108; - public bool Unknown1109; - public bool Unknown1110; - public bool Unknown1111; - public bool Unknown1112; - public bool Unknown1113; - public bool Unknown1114; - public bool Unknown1115; - public bool Unknown1116; - public bool Unknown1117; - public bool Unknown1118; - public bool Unknown1119; - public bool Unknown1120; - public bool Unknown1121; - public bool Unknown1122; - public bool Unknown1123; - public bool Unknown1124; - public bool Unknown1125; - public bool Unknown1126; - public bool Unknown1127; - public bool Unknown1128; - public bool Unknown1129; - public bool Unknown1130; - public bool Unknown1131; - public bool Unknown1132; - public bool Unknown1133; - public bool Unknown1134; - public bool Unknown1135; - public bool Unknown1136; - public bool Unknown1137; - public bool Unknown1138; - public bool Unknown1139; - public bool Unknown1140; - public ushort Unknown1141; - public ushort Unknown1142; - public ushort Unknown1143; - public ushort Unknown1144; - public ushort Unknown1145; - public ushort Unknown1146; - public ushort Unknown1147; - public ushort Unknown1148; - public ushort Unknown1149; - public ushort Unknown1150; - public ushort Unknown1151; - public ushort Unknown1152; - public ushort Unknown1153; - public ushort Unknown1154; - public ushort Unknown1155; - public ushort Unknown1156; - public ushort Unknown1157; - public ushort Unknown1158; - public ushort Unknown1159; - public ushort Unknown1160; - public ushort Unknown1161; - public ushort Unknown1162; - public ushort Unknown1163; - public ushort Unknown1164; - public ushort Unknown1165; - public ushort Unknown1166; - public ushort Unknown1167; - public ushort Unknown1168; - public ushort Unknown1169; - public ushort Unknown1170; - public ushort Unknown1171; - public ushort Unknown1172; - public ushort Unknown1173; - public ushort Unknown1174; - public ushort Unknown1175; - public ushort Unknown1176; - public ushort Unknown1177; - public ushort Unknown1178; - public ushort Unknown1179; - public ushort Unknown1180; - public ushort Unknown1181; - public ushort Unknown1182; - public ushort Unknown1183; - public ushort Unknown1184; - public ushort Unknown1185; - public ushort Unknown1186; - public ushort Unknown1187; - public ushort Unknown1188; - public ushort Unknown1189; - public ushort Unknown1190; - public ushort Unknown1191; - public ushort Unknown1192; - public ushort Unknown1193; - public ushort Unknown1194; - public ushort Unknown1195; - public ushort Unknown1196; - public ushort Unknown1197; - public ushort Unknown1198; - public ushort Unknown1199; - public ushort Unknown1200; - public LazyRow< Quest >[] QuestItem; - public int[] Unknown; - public LazyRow< Achievement >[] AchievementUnlock; - public byte Unknown1381; - public byte Unknown1382; - public byte Unknown1383; - public byte Unknown1384; - public byte Unknown1385; - public byte Unknown1386; - public byte Unknown1387; - public byte Unknown1388; - public byte Unknown1389; - public byte Unknown1390; - public byte Unknown1391; - public byte Unknown1392; - public byte Unknown1393; - public byte Unknown1394; - public byte Unknown1395; - public byte Unknown1396; - public byte Unknown1397; - public byte Unknown1398; - public byte Unknown1399; - public byte Unknown1400; - public byte Unknown1401; - public byte Unknown1402; - public byte Unknown1403; - public byte Unknown1404; - public byte Unknown1405; - public byte Unknown1406; - public byte Unknown1407; - public byte Unknown1408; - public byte Unknown1409; - public byte Unknown1410; - public byte Unknown1411; - public byte Unknown1412; - public byte Unknown1413; - public byte Unknown1414; - public byte Unknown1415; - public byte Unknown1416; - public byte Unknown1417; - public byte Unknown1418; - public byte Unknown1419; - public byte Unknown1420; - public byte Unknown1421; - public byte Unknown1422; - public byte Unknown1423; - public byte Unknown1424; - public byte Unknown1425; - public byte Unknown1426; - public byte Unknown1427; - public byte Unknown1428; - public byte Unknown1429; - public byte Unknown1430; - public byte Unknown1431; - public byte Unknown1432; - public byte Unknown1433; - public byte Unknown1434; - public byte Unknown1435; - public byte Unknown1436; - public byte Unknown1437; - public byte Unknown1438; - public byte Unknown1439; - public byte Unknown1440; - public ushort[] PatchNumber; - public byte UseCurrencyType; - public LazyRow< Quest > QuestUnlock; - public LazyRow< DefaultTalk > CompleteText; - public LazyRow< DefaultTalk > NotCompleteText; - public uint Unknown1505; - public bool Unknown1506; + public SeString Name { get; set; } + public UnkStruct1Struct[] UnkStruct1 { get; set; } + public int Unknown9 { get; set; } + public int Unknown10 { get; set; } + public int Unknown11 { get; set; } + public int Unknown12 { get; set; } + public int Unknown13 { get; set; } + public int Unknown14 { get; set; } + public int Unknown15 { get; set; } + public int Unknown16 { get; set; } + public int Unknown17 { get; set; } + public int Unknown18 { get; set; } + public int Unknown19 { get; set; } + public int Unknown20 { get; set; } + public int Unknown21 { get; set; } + public int Unknown22 { get; set; } + public int Unknown23 { get; set; } + public int Unknown24 { get; set; } + public int Unknown25 { get; set; } + public int Unknown26 { get; set; } + public int Unknown27 { get; set; } + public int Unknown28 { get; set; } + public int Unknown29 { get; set; } + public int Unknown30 { get; set; } + public int Unknown31 { get; set; } + public int Unknown32 { get; set; } + public int Unknown33 { get; set; } + public int Unknown34 { get; set; } + public int Unknown35 { get; set; } + public int Unknown36 { get; set; } + public int Unknown37 { get; set; } + public int Unknown38 { get; set; } + public int Unknown39 { get; set; } + public int Unknown40 { get; set; } + public int Unknown41 { get; set; } + public int Unknown42 { get; set; } + public int Unknown43 { get; set; } + public int Unknown44 { get; set; } + public int Unknown45 { get; set; } + public int Unknown46 { get; set; } + public int Unknown47 { get; set; } + public int Unknown48 { get; set; } + public int Unknown49 { get; set; } + public int Unknown50 { get; set; } + public int Unknown51 { get; set; } + public int Unknown52 { get; set; } + public int Unknown53 { get; set; } + public int Unknown54 { get; set; } + public int Unknown55 { get; set; } + public int Unknown56 { get; set; } + public int Unknown57 { get; set; } + public int Unknown58 { get; set; } + public int Unknown59 { get; set; } + public int Unknown60 { get; set; } + public uint Unknown61 { get; set; } + public uint Unknown62 { get; set; } + public uint Unknown63 { get; set; } + public uint Unknown64 { get; set; } + public uint Unknown65 { get; set; } + public uint Unknown66 { get; set; } + public uint Unknown67 { get; set; } + public uint Unknown68 { get; set; } + public uint Unknown69 { get; set; } + public uint Unknown70 { get; set; } + public uint Unknown71 { get; set; } + public uint Unknown72 { get; set; } + public uint Unknown73 { get; set; } + public uint Unknown74 { get; set; } + public uint Unknown75 { get; set; } + public uint Unknown76 { get; set; } + public uint Unknown77 { get; set; } + public uint Unknown78 { get; set; } + public uint Unknown79 { get; set; } + public uint Unknown80 { get; set; } + public uint Unknown81 { get; set; } + public uint Unknown82 { get; set; } + public uint Unknown83 { get; set; } + public uint Unknown84 { get; set; } + public uint Unknown85 { get; set; } + public uint Unknown86 { get; set; } + public uint Unknown87 { get; set; } + public uint Unknown88 { get; set; } + public uint Unknown89 { get; set; } + public uint Unknown90 { get; set; } + public uint Unknown91 { get; set; } + public uint Unknown92 { get; set; } + public uint Unknown93 { get; set; } + public uint Unknown94 { get; set; } + public uint Unknown95 { get; set; } + public uint Unknown96 { get; set; } + public uint Unknown97 { get; set; } + public uint Unknown98 { get; set; } + public uint Unknown99 { get; set; } + public uint Unknown100 { get; set; } + public uint Unknown101 { get; set; } + public uint Unknown102 { get; set; } + public uint Unknown103 { get; set; } + public uint Unknown104 { get; set; } + public uint Unknown105 { get; set; } + public uint Unknown106 { get; set; } + public uint Unknown107 { get; set; } + public uint Unknown108 { get; set; } + public uint Unknown109 { get; set; } + public uint Unknown110 { get; set; } + public uint Unknown111 { get; set; } + public uint Unknown112 { get; set; } + public uint Unknown113 { get; set; } + public uint Unknown114 { get; set; } + public uint Unknown115 { get; set; } + public uint Unknown116 { get; set; } + public uint Unknown117 { get; set; } + public uint Unknown118 { get; set; } + public uint Unknown119 { get; set; } + public uint Unknown120 { get; set; } + public int Unknown121 { get; set; } + public int Unknown122 { get; set; } + public int Unknown123 { get; set; } + public int Unknown124 { get; set; } + public int Unknown125 { get; set; } + public int Unknown126 { get; set; } + public int Unknown127 { get; set; } + public int Unknown128 { get; set; } + public int Unknown129 { get; set; } + public int Unknown130 { get; set; } + public int Unknown131 { get; set; } + public int Unknown132 { get; set; } + public int Unknown133 { get; set; } + public int Unknown134 { get; set; } + public int Unknown135 { get; set; } + public int Unknown136 { get; set; } + public int Unknown137 { get; set; } + public int Unknown138 { get; set; } + public int Unknown139 { get; set; } + public int Unknown140 { get; set; } + public int Unknown141 { get; set; } + public int Unknown142 { get; set; } + public int Unknown143 { get; set; } + public int Unknown144 { get; set; } + public int Unknown145 { get; set; } + public int Unknown146 { get; set; } + public int Unknown147 { get; set; } + public int Unknown148 { get; set; } + public int Unknown149 { get; set; } + public int Unknown150 { get; set; } + public int Unknown151 { get; set; } + public int Unknown152 { get; set; } + public int Unknown153 { get; set; } + public int Unknown154 { get; set; } + public int Unknown155 { get; set; } + public int Unknown156 { get; set; } + public int Unknown157 { get; set; } + public int Unknown158 { get; set; } + public int Unknown159 { get; set; } + public int Unknown160 { get; set; } + public int Unknown161 { get; set; } + public int Unknown162 { get; set; } + public int Unknown163 { get; set; } + public int Unknown164 { get; set; } + public int Unknown165 { get; set; } + public int Unknown166 { get; set; } + public int Unknown167 { get; set; } + public int Unknown168 { get; set; } + public int Unknown169 { get; set; } + public int Unknown170 { get; set; } + public int Unknown171 { get; set; } + public int Unknown172 { get; set; } + public int Unknown173 { get; set; } + public int Unknown174 { get; set; } + public int Unknown175 { get; set; } + public int Unknown176 { get; set; } + public int Unknown177 { get; set; } + public int Unknown178 { get; set; } + public int Unknown179 { get; set; } + public int Unknown180 { get; set; } + public bool Unknown181 { get; set; } + public bool Unknown182 { get; set; } + public bool Unknown183 { get; set; } + public bool Unknown184 { get; set; } + public bool Unknown185 { get; set; } + public bool Unknown186 { get; set; } + public bool Unknown187 { get; set; } + public bool Unknown188 { get; set; } + public bool Unknown189 { get; set; } + public bool Unknown190 { get; set; } + public bool Unknown191 { get; set; } + public bool Unknown192 { get; set; } + public bool Unknown193 { get; set; } + public bool Unknown194 { get; set; } + public bool Unknown195 { get; set; } + public bool Unknown196 { get; set; } + public bool Unknown197 { get; set; } + public bool Unknown198 { get; set; } + public bool Unknown199 { get; set; } + public bool Unknown200 { get; set; } + public bool Unknown201 { get; set; } + public bool Unknown202 { get; set; } + public bool Unknown203 { get; set; } + public bool Unknown204 { get; set; } + public bool Unknown205 { get; set; } + public bool Unknown206 { get; set; } + public bool Unknown207 { get; set; } + public bool Unknown208 { get; set; } + public bool Unknown209 { get; set; } + public bool Unknown210 { get; set; } + public bool Unknown211 { get; set; } + public bool Unknown212 { get; set; } + public bool Unknown213 { get; set; } + public bool Unknown214 { get; set; } + public bool Unknown215 { get; set; } + public bool Unknown216 { get; set; } + public bool Unknown217 { get; set; } + public bool Unknown218 { get; set; } + public bool Unknown219 { get; set; } + public bool Unknown220 { get; set; } + public bool Unknown221 { get; set; } + public bool Unknown222 { get; set; } + public bool Unknown223 { get; set; } + public bool Unknown224 { get; set; } + public bool Unknown225 { get; set; } + public bool Unknown226 { get; set; } + public bool Unknown227 { get; set; } + public bool Unknown228 { get; set; } + public bool Unknown229 { get; set; } + public bool Unknown230 { get; set; } + public bool Unknown231 { get; set; } + public bool Unknown232 { get; set; } + public bool Unknown233 { get; set; } + public bool Unknown234 { get; set; } + public bool Unknown235 { get; set; } + public bool Unknown236 { get; set; } + public bool Unknown237 { get; set; } + public bool Unknown238 { get; set; } + public bool Unknown239 { get; set; } + public bool Unknown240 { get; set; } + public int Unknown241 { get; set; } + public int Unknown242 { get; set; } + public int Unknown243 { get; set; } + public int Unknown244 { get; set; } + public int Unknown245 { get; set; } + public int Unknown246 { get; set; } + public int Unknown247 { get; set; } + public int Unknown248 { get; set; } + public int Unknown249 { get; set; } + public int Unknown250 { get; set; } + public int Unknown251 { get; set; } + public int Unknown252 { get; set; } + public int Unknown253 { get; set; } + public int Unknown254 { get; set; } + public int Unknown255 { get; set; } + public int Unknown256 { get; set; } + public int Unknown257 { get; set; } + public int Unknown258 { get; set; } + public int Unknown259 { get; set; } + public int Unknown260 { get; set; } + public int Unknown261 { get; set; } + public int Unknown262 { get; set; } + public int Unknown263 { get; set; } + public int Unknown264 { get; set; } + public int Unknown265 { get; set; } + public int Unknown266 { get; set; } + public int Unknown267 { get; set; } + public int Unknown268 { get; set; } + public int Unknown269 { get; set; } + public int Unknown270 { get; set; } + public int Unknown271 { get; set; } + public int Unknown272 { get; set; } + public int Unknown273 { get; set; } + public int Unknown274 { get; set; } + public int Unknown275 { get; set; } + public int Unknown276 { get; set; } + public int Unknown277 { get; set; } + public int Unknown278 { get; set; } + public int Unknown279 { get; set; } + public int Unknown280 { get; set; } + public int Unknown281 { get; set; } + public int Unknown282 { get; set; } + public int Unknown283 { get; set; } + public int Unknown284 { get; set; } + public int Unknown285 { get; set; } + public int Unknown286 { get; set; } + public int Unknown287 { get; set; } + public int Unknown288 { get; set; } + public int Unknown289 { get; set; } + public int Unknown290 { get; set; } + public int Unknown291 { get; set; } + public int Unknown292 { get; set; } + public int Unknown293 { get; set; } + public int Unknown294 { get; set; } + public int Unknown295 { get; set; } + public int Unknown296 { get; set; } + public int Unknown297 { get; set; } + public int Unknown298 { get; set; } + public int Unknown299 { get; set; } + public int Unknown300 { get; set; } + public uint Unknown301 { get; set; } + public uint Unknown302 { get; set; } + public uint Unknown303 { get; set; } + public uint Unknown304 { get; set; } + public uint Unknown305 { get; set; } + public uint Unknown306 { get; set; } + public uint Unknown307 { get; set; } + public uint Unknown308 { get; set; } + public uint Unknown309 { get; set; } + public uint Unknown310 { get; set; } + public uint Unknown311 { get; set; } + public uint Unknown312 { get; set; } + public uint Unknown313 { get; set; } + public uint Unknown314 { get; set; } + public uint Unknown315 { get; set; } + public uint Unknown316 { get; set; } + public uint Unknown317 { get; set; } + public uint Unknown318 { get; set; } + public uint Unknown319 { get; set; } + public uint Unknown320 { get; set; } + public uint Unknown321 { get; set; } + public uint Unknown322 { get; set; } + public uint Unknown323 { get; set; } + public uint Unknown324 { get; set; } + public uint Unknown325 { get; set; } + public uint Unknown326 { get; set; } + public uint Unknown327 { get; set; } + public uint Unknown328 { get; set; } + public uint Unknown329 { get; set; } + public uint Unknown330 { get; set; } + public uint Unknown331 { get; set; } + public uint Unknown332 { get; set; } + public uint Unknown333 { get; set; } + public uint Unknown334 { get; set; } + public uint Unknown335 { get; set; } + public uint Unknown336 { get; set; } + public uint Unknown337 { get; set; } + public uint Unknown338 { get; set; } + public uint Unknown339 { get; set; } + public uint Unknown340 { get; set; } + public uint Unknown341 { get; set; } + public uint Unknown342 { get; set; } + public uint Unknown343 { get; set; } + public uint Unknown344 { get; set; } + public uint Unknown345 { get; set; } + public uint Unknown346 { get; set; } + public uint Unknown347 { get; set; } + public uint Unknown348 { get; set; } + public uint Unknown349 { get; set; } + public uint Unknown350 { get; set; } + public uint Unknown351 { get; set; } + public uint Unknown352 { get; set; } + public uint Unknown353 { get; set; } + public uint Unknown354 { get; set; } + public uint Unknown355 { get; set; } + public uint Unknown356 { get; set; } + public uint Unknown357 { get; set; } + public uint Unknown358 { get; set; } + public uint Unknown359 { get; set; } + public uint Unknown360 { get; set; } + public int Unknown361 { get; set; } + public int Unknown362 { get; set; } + public int Unknown363 { get; set; } + public int Unknown364 { get; set; } + public int Unknown365 { get; set; } + public int Unknown366 { get; set; } + public int Unknown367 { get; set; } + public int Unknown368 { get; set; } + public int Unknown369 { get; set; } + public int Unknown370 { get; set; } + public int Unknown371 { get; set; } + public int Unknown372 { get; set; } + public int Unknown373 { get; set; } + public int Unknown374 { get; set; } + public int Unknown375 { get; set; } + public int Unknown376 { get; set; } + public int Unknown377 { get; set; } + public int Unknown378 { get; set; } + public int Unknown379 { get; set; } + public int Unknown380 { get; set; } + public int Unknown381 { get; set; } + public int Unknown382 { get; set; } + public int Unknown383 { get; set; } + public int Unknown384 { get; set; } + public int Unknown385 { get; set; } + public int Unknown386 { get; set; } + public int Unknown387 { get; set; } + public int Unknown388 { get; set; } + public int Unknown389 { get; set; } + public int Unknown390 { get; set; } + public int Unknown391 { get; set; } + public int Unknown392 { get; set; } + public int Unknown393 { get; set; } + public int Unknown394 { get; set; } + public int Unknown395 { get; set; } + public int Unknown396 { get; set; } + public int Unknown397 { get; set; } + public int Unknown398 { get; set; } + public int Unknown399 { get; set; } + public int Unknown400 { get; set; } + public int Unknown401 { get; set; } + public int Unknown402 { get; set; } + public int Unknown403 { get; set; } + public int Unknown404 { get; set; } + public int Unknown405 { get; set; } + public int Unknown406 { get; set; } + public int Unknown407 { get; set; } + public int Unknown408 { get; set; } + public int Unknown409 { get; set; } + public int Unknown410 { get; set; } + public int Unknown411 { get; set; } + public int Unknown412 { get; set; } + public int Unknown413 { get; set; } + public int Unknown414 { get; set; } + public int Unknown415 { get; set; } + public int Unknown416 { get; set; } + public int Unknown417 { get; set; } + public int Unknown418 { get; set; } + public int Unknown419 { get; set; } + public int Unknown420 { get; set; } + public bool Unknown421 { get; set; } + public bool Unknown422 { get; set; } + public bool Unknown423 { get; set; } + public bool Unknown424 { get; set; } + public bool Unknown425 { get; set; } + public bool Unknown426 { get; set; } + public bool Unknown427 { get; set; } + public bool Unknown428 { get; set; } + public bool Unknown429 { get; set; } + public bool Unknown430 { get; set; } + public bool Unknown431 { get; set; } + public bool Unknown432 { get; set; } + public bool Unknown433 { get; set; } + public bool Unknown434 { get; set; } + public bool Unknown435 { get; set; } + public bool Unknown436 { get; set; } + public bool Unknown437 { get; set; } + public bool Unknown438 { get; set; } + public bool Unknown439 { get; set; } + public bool Unknown440 { get; set; } + public bool Unknown441 { get; set; } + public bool Unknown442 { get; set; } + public bool Unknown443 { get; set; } + public bool Unknown444 { get; set; } + public bool Unknown445 { get; set; } + public bool Unknown446 { get; set; } + public bool Unknown447 { get; set; } + public bool Unknown448 { get; set; } + public bool Unknown449 { get; set; } + public bool Unknown450 { get; set; } + public bool Unknown451 { get; set; } + public bool Unknown452 { get; set; } + public bool Unknown453 { get; set; } + public bool Unknown454 { get; set; } + public bool Unknown455 { get; set; } + public bool Unknown456 { get; set; } + public bool Unknown457 { get; set; } + public bool Unknown458 { get; set; } + public bool Unknown459 { get; set; } + public bool Unknown460 { get; set; } + public bool Unknown461 { get; set; } + public bool Unknown462 { get; set; } + public bool Unknown463 { get; set; } + public bool Unknown464 { get; set; } + public bool Unknown465 { get; set; } + public bool Unknown466 { get; set; } + public bool Unknown467 { get; set; } + public bool Unknown468 { get; set; } + public bool Unknown469 { get; set; } + public bool Unknown470 { get; set; } + public bool Unknown471 { get; set; } + public bool Unknown472 { get; set; } + public bool Unknown473 { get; set; } + public bool Unknown474 { get; set; } + public bool Unknown475 { get; set; } + public bool Unknown476 { get; set; } + public bool Unknown477 { get; set; } + public bool Unknown478 { get; set; } + public bool Unknown479 { get; set; } + public bool Unknown480 { get; set; } + public UnkStruct481Struct[] UnkStruct481 { get; set; } + public int Unknown493 { get; set; } + public int Unknown494 { get; set; } + public int Unknown495 { get; set; } + public int Unknown496 { get; set; } + public int Unknown497 { get; set; } + public int Unknown498 { get; set; } + public int Unknown499 { get; set; } + public int Unknown500 { get; set; } + public int Unknown501 { get; set; } + public int Unknown502 { get; set; } + public int Unknown503 { get; set; } + public int Unknown504 { get; set; } + public int Unknown505 { get; set; } + public int Unknown506 { get; set; } + public int Unknown507 { get; set; } + public int Unknown508 { get; set; } + public int Unknown509 { get; set; } + public int Unknown510 { get; set; } + public int Unknown511 { get; set; } + public int Unknown512 { get; set; } + public int Unknown513 { get; set; } + public int Unknown514 { get; set; } + public int Unknown515 { get; set; } + public int Unknown516 { get; set; } + public int Unknown517 { get; set; } + public int Unknown518 { get; set; } + public int Unknown519 { get; set; } + public int Unknown520 { get; set; } + public int Unknown521 { get; set; } + public int Unknown522 { get; set; } + public int Unknown523 { get; set; } + public int Unknown524 { get; set; } + public int Unknown525 { get; set; } + public int Unknown526 { get; set; } + public int Unknown527 { get; set; } + public int Unknown528 { get; set; } + public int Unknown529 { get; set; } + public int Unknown530 { get; set; } + public int Unknown531 { get; set; } + public int Unknown532 { get; set; } + public int Unknown533 { get; set; } + public int Unknown534 { get; set; } + public int Unknown535 { get; set; } + public int Unknown536 { get; set; } + public int Unknown537 { get; set; } + public int Unknown538 { get; set; } + public int Unknown539 { get; set; } + public int Unknown540 { get; set; } + public uint Unknown541 { get; set; } + public uint Unknown542 { get; set; } + public uint Unknown543 { get; set; } + public uint Unknown544 { get; set; } + public uint Unknown545 { get; set; } + public uint Unknown546 { get; set; } + public uint Unknown547 { get; set; } + public uint Unknown548 { get; set; } + public uint Unknown549 { get; set; } + public uint Unknown550 { get; set; } + public uint Unknown551 { get; set; } + public uint Unknown552 { get; set; } + public uint Unknown553 { get; set; } + public uint Unknown554 { get; set; } + public uint Unknown555 { get; set; } + public uint Unknown556 { get; set; } + public uint Unknown557 { get; set; } + public uint Unknown558 { get; set; } + public uint Unknown559 { get; set; } + public uint Unknown560 { get; set; } + public uint Unknown561 { get; set; } + public uint Unknown562 { get; set; } + public uint Unknown563 { get; set; } + public uint Unknown564 { get; set; } + public uint Unknown565 { get; set; } + public uint Unknown566 { get; set; } + public uint Unknown567 { get; set; } + public uint Unknown568 { get; set; } + public uint Unknown569 { get; set; } + public uint Unknown570 { get; set; } + public uint Unknown571 { get; set; } + public uint Unknown572 { get; set; } + public uint Unknown573 { get; set; } + public uint Unknown574 { get; set; } + public uint Unknown575 { get; set; } + public uint Unknown576 { get; set; } + public uint Unknown577 { get; set; } + public uint Unknown578 { get; set; } + public uint Unknown579 { get; set; } + public uint Unknown580 { get; set; } + public uint Unknown581 { get; set; } + public uint Unknown582 { get; set; } + public uint Unknown583 { get; set; } + public uint Unknown584 { get; set; } + public uint Unknown585 { get; set; } + public uint Unknown586 { get; set; } + public uint Unknown587 { get; set; } + public uint Unknown588 { get; set; } + public uint Unknown589 { get; set; } + public uint Unknown590 { get; set; } + public uint Unknown591 { get; set; } + public uint Unknown592 { get; set; } + public uint Unknown593 { get; set; } + public uint Unknown594 { get; set; } + public uint Unknown595 { get; set; } + public uint Unknown596 { get; set; } + public uint Unknown597 { get; set; } + public uint Unknown598 { get; set; } + public uint Unknown599 { get; set; } + public uint Unknown600 { get; set; } + public bool Unknown601 { get; set; } + public bool Unknown602 { get; set; } + public bool Unknown603 { get; set; } + public bool Unknown604 { get; set; } + public bool Unknown605 { get; set; } + public bool Unknown606 { get; set; } + public bool Unknown607 { get; set; } + public bool Unknown608 { get; set; } + public bool Unknown609 { get; set; } + public bool Unknown610 { get; set; } + public bool Unknown611 { get; set; } + public bool Unknown612 { get; set; } + public bool Unknown613 { get; set; } + public bool Unknown614 { get; set; } + public bool Unknown615 { get; set; } + public bool Unknown616 { get; set; } + public bool Unknown617 { get; set; } + public bool Unknown618 { get; set; } + public bool Unknown619 { get; set; } + public bool Unknown620 { get; set; } + public bool Unknown621 { get; set; } + public bool Unknown622 { get; set; } + public bool Unknown623 { get; set; } + public bool Unknown624 { get; set; } + public bool Unknown625 { get; set; } + public bool Unknown626 { get; set; } + public bool Unknown627 { get; set; } + public bool Unknown628 { get; set; } + public bool Unknown629 { get; set; } + public bool Unknown630 { get; set; } + public bool Unknown631 { get; set; } + public bool Unknown632 { get; set; } + public bool Unknown633 { get; set; } + public bool Unknown634 { get; set; } + public bool Unknown635 { get; set; } + public bool Unknown636 { get; set; } + public bool Unknown637 { get; set; } + public bool Unknown638 { get; set; } + public bool Unknown639 { get; set; } + public bool Unknown640 { get; set; } + public bool Unknown641 { get; set; } + public bool Unknown642 { get; set; } + public bool Unknown643 { get; set; } + public bool Unknown644 { get; set; } + public bool Unknown645 { get; set; } + public bool Unknown646 { get; set; } + public bool Unknown647 { get; set; } + public bool Unknown648 { get; set; } + public bool Unknown649 { get; set; } + public bool Unknown650 { get; set; } + public bool Unknown651 { get; set; } + public bool Unknown652 { get; set; } + public bool Unknown653 { get; set; } + public bool Unknown654 { get; set; } + public bool Unknown655 { get; set; } + public bool Unknown656 { get; set; } + public bool Unknown657 { get; set; } + public bool Unknown658 { get; set; } + public bool Unknown659 { get; set; } + public bool Unknown660 { get; set; } + public ushort Unknown661 { get; set; } + public ushort Unknown662 { get; set; } + public ushort Unknown663 { get; set; } + public ushort Unknown664 { get; set; } + public ushort Unknown665 { get; set; } + public ushort Unknown666 { get; set; } + public ushort Unknown667 { get; set; } + public ushort Unknown668 { get; set; } + public ushort Unknown669 { get; set; } + public ushort Unknown670 { get; set; } + public ushort Unknown671 { get; set; } + public ushort Unknown672 { get; set; } + public ushort Unknown673 { get; set; } + public ushort Unknown674 { get; set; } + public ushort Unknown675 { get; set; } + public ushort Unknown676 { get; set; } + public ushort Unknown677 { get; set; } + public ushort Unknown678 { get; set; } + public ushort Unknown679 { get; set; } + public ushort Unknown680 { get; set; } + public ushort Unknown681 { get; set; } + public ushort Unknown682 { get; set; } + public ushort Unknown683 { get; set; } + public ushort Unknown684 { get; set; } + public ushort Unknown685 { get; set; } + public ushort Unknown686 { get; set; } + public ushort Unknown687 { get; set; } + public ushort Unknown688 { get; set; } + public ushort Unknown689 { get; set; } + public ushort Unknown690 { get; set; } + public ushort Unknown691 { get; set; } + public ushort Unknown692 { get; set; } + public ushort Unknown693 { get; set; } + public ushort Unknown694 { get; set; } + public ushort Unknown695 { get; set; } + public ushort Unknown696 { get; set; } + public ushort Unknown697 { get; set; } + public ushort Unknown698 { get; set; } + public ushort Unknown699 { get; set; } + public ushort Unknown700 { get; set; } + public ushort Unknown701 { get; set; } + public ushort Unknown702 { get; set; } + public ushort Unknown703 { get; set; } + public ushort Unknown704 { get; set; } + public ushort Unknown705 { get; set; } + public ushort Unknown706 { get; set; } + public ushort Unknown707 { get; set; } + public ushort Unknown708 { get; set; } + public ushort Unknown709 { get; set; } + public ushort Unknown710 { get; set; } + public ushort Unknown711 { get; set; } + public ushort Unknown712 { get; set; } + public ushort Unknown713 { get; set; } + public ushort Unknown714 { get; set; } + public ushort Unknown715 { get; set; } + public ushort Unknown716 { get; set; } + public ushort Unknown717 { get; set; } + public ushort Unknown718 { get; set; } + public ushort Unknown719 { get; set; } + public ushort Unknown720 { get; set; } + public int Unknown721 { get; set; } + public int Unknown722 { get; set; } + public int Unknown723 { get; set; } + public int Unknown724 { get; set; } + public int Unknown725 { get; set; } + public int Unknown726 { get; set; } + public int Unknown727 { get; set; } + public int Unknown728 { get; set; } + public int Unknown729 { get; set; } + public int Unknown730 { get; set; } + public int Unknown731 { get; set; } + public int Unknown732 { get; set; } + public int Unknown733 { get; set; } + public int Unknown734 { get; set; } + public int Unknown735 { get; set; } + public int Unknown736 { get; set; } + public int Unknown737 { get; set; } + public int Unknown738 { get; set; } + public int Unknown739 { get; set; } + public int Unknown740 { get; set; } + public int Unknown741 { get; set; } + public int Unknown742 { get; set; } + public int Unknown743 { get; set; } + public int Unknown744 { get; set; } + public int Unknown745 { get; set; } + public int Unknown746 { get; set; } + public int Unknown747 { get; set; } + public int Unknown748 { get; set; } + public int Unknown749 { get; set; } + public int Unknown750 { get; set; } + public int Unknown751 { get; set; } + public int Unknown752 { get; set; } + public int Unknown753 { get; set; } + public int Unknown754 { get; set; } + public int Unknown755 { get; set; } + public int Unknown756 { get; set; } + public int Unknown757 { get; set; } + public int Unknown758 { get; set; } + public int Unknown759 { get; set; } + public int Unknown760 { get; set; } + public int Unknown761 { get; set; } + public int Unknown762 { get; set; } + public int Unknown763 { get; set; } + public int Unknown764 { get; set; } + public int Unknown765 { get; set; } + public int Unknown766 { get; set; } + public int Unknown767 { get; set; } + public int Unknown768 { get; set; } + public int Unknown769 { get; set; } + public int Unknown770 { get; set; } + public int Unknown771 { get; set; } + public int Unknown772 { get; set; } + public int Unknown773 { get; set; } + public int Unknown774 { get; set; } + public int Unknown775 { get; set; } + public int Unknown776 { get; set; } + public int Unknown777 { get; set; } + public int Unknown778 { get; set; } + public int Unknown779 { get; set; } + public int Unknown780 { get; set; } + public uint Unknown781 { get; set; } + public uint Unknown782 { get; set; } + public uint Unknown783 { get; set; } + public uint Unknown784 { get; set; } + public uint Unknown785 { get; set; } + public uint Unknown786 { get; set; } + public uint Unknown787 { get; set; } + public uint Unknown788 { get; set; } + public uint Unknown789 { get; set; } + public uint Unknown790 { get; set; } + public uint Unknown791 { get; set; } + public uint Unknown792 { get; set; } + public uint Unknown793 { get; set; } + public uint Unknown794 { get; set; } + public uint Unknown795 { get; set; } + public uint Unknown796 { get; set; } + public uint Unknown797 { get; set; } + public uint Unknown798 { get; set; } + public uint Unknown799 { get; set; } + public uint Unknown800 { get; set; } + public uint Unknown801 { get; set; } + public uint Unknown802 { get; set; } + public uint Unknown803 { get; set; } + public uint Unknown804 { get; set; } + public uint Unknown805 { get; set; } + public uint Unknown806 { get; set; } + public uint Unknown807 { get; set; } + public uint Unknown808 { get; set; } + public uint Unknown809 { get; set; } + public uint Unknown810 { get; set; } + public uint Unknown811 { get; set; } + public uint Unknown812 { get; set; } + public uint Unknown813 { get; set; } + public uint Unknown814 { get; set; } + public uint Unknown815 { get; set; } + public uint Unknown816 { get; set; } + public uint Unknown817 { get; set; } + public uint Unknown818 { get; set; } + public uint Unknown819 { get; set; } + public uint Unknown820 { get; set; } + public uint Unknown821 { get; set; } + public uint Unknown822 { get; set; } + public uint Unknown823 { get; set; } + public uint Unknown824 { get; set; } + public uint Unknown825 { get; set; } + public uint Unknown826 { get; set; } + public uint Unknown827 { get; set; } + public uint Unknown828 { get; set; } + public uint Unknown829 { get; set; } + public uint Unknown830 { get; set; } + public uint Unknown831 { get; set; } + public uint Unknown832 { get; set; } + public uint Unknown833 { get; set; } + public uint Unknown834 { get; set; } + public uint Unknown835 { get; set; } + public uint Unknown836 { get; set; } + public uint Unknown837 { get; set; } + public uint Unknown838 { get; set; } + public uint Unknown839 { get; set; } + public uint Unknown840 { get; set; } + public bool Unknown841 { get; set; } + public bool Unknown842 { get; set; } + public bool Unknown843 { get; set; } + public bool Unknown844 { get; set; } + public bool Unknown845 { get; set; } + public bool Unknown846 { get; set; } + public bool Unknown847 { get; set; } + public bool Unknown848 { get; set; } + public bool Unknown849 { get; set; } + public bool Unknown850 { get; set; } + public bool Unknown851 { get; set; } + public bool Unknown852 { get; set; } + public bool Unknown853 { get; set; } + public bool Unknown854 { get; set; } + public bool Unknown855 { get; set; } + public bool Unknown856 { get; set; } + public bool Unknown857 { get; set; } + public bool Unknown858 { get; set; } + public bool Unknown859 { get; set; } + public bool Unknown860 { get; set; } + public bool Unknown861 { get; set; } + public bool Unknown862 { get; set; } + public bool Unknown863 { get; set; } + public bool Unknown864 { get; set; } + public bool Unknown865 { get; set; } + public bool Unknown866 { get; set; } + public bool Unknown867 { get; set; } + public bool Unknown868 { get; set; } + public bool Unknown869 { get; set; } + public bool Unknown870 { get; set; } + public bool Unknown871 { get; set; } + public bool Unknown872 { get; set; } + public bool Unknown873 { get; set; } + public bool Unknown874 { get; set; } + public bool Unknown875 { get; set; } + public bool Unknown876 { get; set; } + public bool Unknown877 { get; set; } + public bool Unknown878 { get; set; } + public bool Unknown879 { get; set; } + public bool Unknown880 { get; set; } + public bool Unknown881 { get; set; } + public bool Unknown882 { get; set; } + public bool Unknown883 { get; set; } + public bool Unknown884 { get; set; } + public bool Unknown885 { get; set; } + public bool Unknown886 { get; set; } + public bool Unknown887 { get; set; } + public bool Unknown888 { get; set; } + public bool Unknown889 { get; set; } + public bool Unknown890 { get; set; } + public bool Unknown891 { get; set; } + public bool Unknown892 { get; set; } + public bool Unknown893 { get; set; } + public bool Unknown894 { get; set; } + public bool Unknown895 { get; set; } + public bool Unknown896 { get; set; } + public bool Unknown897 { get; set; } + public bool Unknown898 { get; set; } + public bool Unknown899 { get; set; } + public bool Unknown900 { get; set; } + public ushort Unknown901 { get; set; } + public ushort Unknown902 { get; set; } + public ushort Unknown903 { get; set; } + public ushort Unknown904 { get; set; } + public ushort Unknown905 { get; set; } + public ushort Unknown906 { get; set; } + public ushort Unknown907 { get; set; } + public ushort Unknown908 { get; set; } + public ushort Unknown909 { get; set; } + public ushort Unknown910 { get; set; } + public ushort Unknown911 { get; set; } + public ushort Unknown912 { get; set; } + public ushort Unknown913 { get; set; } + public ushort Unknown914 { get; set; } + public ushort Unknown915 { get; set; } + public ushort Unknown916 { get; set; } + public ushort Unknown917 { get; set; } + public ushort Unknown918 { get; set; } + public ushort Unknown919 { get; set; } + public ushort Unknown920 { get; set; } + public ushort Unknown921 { get; set; } + public ushort Unknown922 { get; set; } + public ushort Unknown923 { get; set; } + public ushort Unknown924 { get; set; } + public ushort Unknown925 { get; set; } + public ushort Unknown926 { get; set; } + public ushort Unknown927 { get; set; } + public ushort Unknown928 { get; set; } + public ushort Unknown929 { get; set; } + public ushort Unknown930 { get; set; } + public ushort Unknown931 { get; set; } + public ushort Unknown932 { get; set; } + public ushort Unknown933 { get; set; } + public ushort Unknown934 { get; set; } + public ushort Unknown935 { get; set; } + public ushort Unknown936 { get; set; } + public ushort Unknown937 { get; set; } + public ushort Unknown938 { get; set; } + public ushort Unknown939 { get; set; } + public ushort Unknown940 { get; set; } + public ushort Unknown941 { get; set; } + public ushort Unknown942 { get; set; } + public ushort Unknown943 { get; set; } + public ushort Unknown944 { get; set; } + public ushort Unknown945 { get; set; } + public ushort Unknown946 { get; set; } + public ushort Unknown947 { get; set; } + public ushort Unknown948 { get; set; } + public ushort Unknown949 { get; set; } + public ushort Unknown950 { get; set; } + public ushort Unknown951 { get; set; } + public ushort Unknown952 { get; set; } + public ushort Unknown953 { get; set; } + public ushort Unknown954 { get; set; } + public ushort Unknown955 { get; set; } + public ushort Unknown956 { get; set; } + public ushort Unknown957 { get; set; } + public ushort Unknown958 { get; set; } + public ushort Unknown959 { get; set; } + public ushort Unknown960 { get; set; } + public int Unknown961 { get; set; } + public int Unknown962 { get; set; } + public int Unknown963 { get; set; } + public int Unknown964 { get; set; } + public int Unknown965 { get; set; } + public int Unknown966 { get; set; } + public int Unknown967 { get; set; } + public int Unknown968 { get; set; } + public int Unknown969 { get; set; } + public int Unknown970 { get; set; } + public int Unknown971 { get; set; } + public int Unknown972 { get; set; } + public int Unknown973 { get; set; } + public int Unknown974 { get; set; } + public int Unknown975 { get; set; } + public int Unknown976 { get; set; } + public int Unknown977 { get; set; } + public int Unknown978 { get; set; } + public int Unknown979 { get; set; } + public int Unknown980 { get; set; } + public int Unknown981 { get; set; } + public int Unknown982 { get; set; } + public int Unknown983 { get; set; } + public int Unknown984 { get; set; } + public int Unknown985 { get; set; } + public int Unknown986 { get; set; } + public int Unknown987 { get; set; } + public int Unknown988 { get; set; } + public int Unknown989 { get; set; } + public int Unknown990 { get; set; } + public int Unknown991 { get; set; } + public int Unknown992 { get; set; } + public int Unknown993 { get; set; } + public int Unknown994 { get; set; } + public int Unknown995 { get; set; } + public int Unknown996 { get; set; } + public int Unknown997 { get; set; } + public int Unknown998 { get; set; } + public int Unknown999 { get; set; } + public int Unknown1000 { get; set; } + public int Unknown1001 { get; set; } + public int Unknown1002 { get; set; } + public int Unknown1003 { get; set; } + public int Unknown1004 { get; set; } + public int Unknown1005 { get; set; } + public int Unknown1006 { get; set; } + public int Unknown1007 { get; set; } + public int Unknown1008 { get; set; } + public int Unknown1009 { get; set; } + public int Unknown1010 { get; set; } + public int Unknown1011 { get; set; } + public int Unknown1012 { get; set; } + public int Unknown1013 { get; set; } + public int Unknown1014 { get; set; } + public int Unknown1015 { get; set; } + public int Unknown1016 { get; set; } + public int Unknown1017 { get; set; } + public int Unknown1018 { get; set; } + public int Unknown1019 { get; set; } + public int Unknown1020 { get; set; } + public uint Unknown1021 { get; set; } + public uint Unknown1022 { get; set; } + public uint Unknown1023 { get; set; } + public uint Unknown1024 { get; set; } + public uint Unknown1025 { get; set; } + public uint Unknown1026 { get; set; } + public uint Unknown1027 { get; set; } + public uint Unknown1028 { get; set; } + public uint Unknown1029 { get; set; } + public uint Unknown1030 { get; set; } + public uint Unknown1031 { get; set; } + public uint Unknown1032 { get; set; } + public uint Unknown1033 { get; set; } + public uint Unknown1034 { get; set; } + public uint Unknown1035 { get; set; } + public uint Unknown1036 { get; set; } + public uint Unknown1037 { get; set; } + public uint Unknown1038 { get; set; } + public uint Unknown1039 { get; set; } + public uint Unknown1040 { get; set; } + public uint Unknown1041 { get; set; } + public uint Unknown1042 { get; set; } + public uint Unknown1043 { get; set; } + public uint Unknown1044 { get; set; } + public uint Unknown1045 { get; set; } + public uint Unknown1046 { get; set; } + public uint Unknown1047 { get; set; } + public uint Unknown1048 { get; set; } + public uint Unknown1049 { get; set; } + public uint Unknown1050 { get; set; } + public uint Unknown1051 { get; set; } + public uint Unknown1052 { get; set; } + public uint Unknown1053 { get; set; } + public uint Unknown1054 { get; set; } + public uint Unknown1055 { get; set; } + public uint Unknown1056 { get; set; } + public uint Unknown1057 { get; set; } + public uint Unknown1058 { get; set; } + public uint Unknown1059 { get; set; } + public uint Unknown1060 { get; set; } + public uint Unknown1061 { get; set; } + public uint Unknown1062 { get; set; } + public uint Unknown1063 { get; set; } + public uint Unknown1064 { get; set; } + public uint Unknown1065 { get; set; } + public uint Unknown1066 { get; set; } + public uint Unknown1067 { get; set; } + public uint Unknown1068 { get; set; } + public uint Unknown1069 { get; set; } + public uint Unknown1070 { get; set; } + public uint Unknown1071 { get; set; } + public uint Unknown1072 { get; set; } + public uint Unknown1073 { get; set; } + public uint Unknown1074 { get; set; } + public uint Unknown1075 { get; set; } + public uint Unknown1076 { get; set; } + public uint Unknown1077 { get; set; } + public uint Unknown1078 { get; set; } + public uint Unknown1079 { get; set; } + public uint Unknown1080 { get; set; } + public bool Unknown1081 { get; set; } + public bool Unknown1082 { get; set; } + public bool Unknown1083 { get; set; } + public bool Unknown1084 { get; set; } + public bool Unknown1085 { get; set; } + public bool Unknown1086 { get; set; } + public bool Unknown1087 { get; set; } + public bool Unknown1088 { get; set; } + public bool Unknown1089 { get; set; } + public bool Unknown1090 { get; set; } + public bool Unknown1091 { get; set; } + public bool Unknown1092 { get; set; } + public bool Unknown1093 { get; set; } + public bool Unknown1094 { get; set; } + public bool Unknown1095 { get; set; } + public bool Unknown1096 { get; set; } + public bool Unknown1097 { get; set; } + public bool Unknown1098 { get; set; } + public bool Unknown1099 { get; set; } + public bool Unknown1100 { get; set; } + public bool Unknown1101 { get; set; } + public bool Unknown1102 { get; set; } + public bool Unknown1103 { get; set; } + public bool Unknown1104 { get; set; } + public bool Unknown1105 { get; set; } + public bool Unknown1106 { get; set; } + public bool Unknown1107 { get; set; } + public bool Unknown1108 { get; set; } + public bool Unknown1109 { get; set; } + public bool Unknown1110 { get; set; } + public bool Unknown1111 { get; set; } + public bool Unknown1112 { get; set; } + public bool Unknown1113 { get; set; } + public bool Unknown1114 { get; set; } + public bool Unknown1115 { get; set; } + public bool Unknown1116 { get; set; } + public bool Unknown1117 { get; set; } + public bool Unknown1118 { get; set; } + public bool Unknown1119 { get; set; } + public bool Unknown1120 { get; set; } + public bool Unknown1121 { get; set; } + public bool Unknown1122 { get; set; } + public bool Unknown1123 { get; set; } + public bool Unknown1124 { get; set; } + public bool Unknown1125 { get; set; } + public bool Unknown1126 { get; set; } + public bool Unknown1127 { get; set; } + public bool Unknown1128 { get; set; } + public bool Unknown1129 { get; set; } + public bool Unknown1130 { get; set; } + public bool Unknown1131 { get; set; } + public bool Unknown1132 { get; set; } + public bool Unknown1133 { get; set; } + public bool Unknown1134 { get; set; } + public bool Unknown1135 { get; set; } + public bool Unknown1136 { get; set; } + public bool Unknown1137 { get; set; } + public bool Unknown1138 { get; set; } + public bool Unknown1139 { get; set; } + public bool Unknown1140 { get; set; } + public ushort Unknown1141 { get; set; } + public ushort Unknown1142 { get; set; } + public ushort Unknown1143 { get; set; } + public ushort Unknown1144 { get; set; } + public ushort Unknown1145 { get; set; } + public ushort Unknown1146 { get; set; } + public ushort Unknown1147 { get; set; } + public ushort Unknown1148 { get; set; } + public ushort Unknown1149 { get; set; } + public ushort Unknown1150 { get; set; } + public ushort Unknown1151 { get; set; } + public ushort Unknown1152 { get; set; } + public ushort Unknown1153 { get; set; } + public ushort Unknown1154 { get; set; } + public ushort Unknown1155 { get; set; } + public ushort Unknown1156 { get; set; } + public ushort Unknown1157 { get; set; } + public ushort Unknown1158 { get; set; } + public ushort Unknown1159 { get; set; } + public ushort Unknown1160 { get; set; } + public ushort Unknown1161 { get; set; } + public ushort Unknown1162 { get; set; } + public ushort Unknown1163 { get; set; } + public ushort Unknown1164 { get; set; } + public ushort Unknown1165 { get; set; } + public ushort Unknown1166 { get; set; } + public ushort Unknown1167 { get; set; } + public ushort Unknown1168 { get; set; } + public ushort Unknown1169 { get; set; } + public ushort Unknown1170 { get; set; } + public ushort Unknown1171 { get; set; } + public ushort Unknown1172 { get; set; } + public ushort Unknown1173 { get; set; } + public ushort Unknown1174 { get; set; } + public ushort Unknown1175 { get; set; } + public ushort Unknown1176 { get; set; } + public ushort Unknown1177 { get; set; } + public ushort Unknown1178 { get; set; } + public ushort Unknown1179 { get; set; } + public ushort Unknown1180 { get; set; } + public ushort Unknown1181 { get; set; } + public ushort Unknown1182 { get; set; } + public ushort Unknown1183 { get; set; } + public ushort Unknown1184 { get; set; } + public ushort Unknown1185 { get; set; } + public ushort Unknown1186 { get; set; } + public ushort Unknown1187 { get; set; } + public ushort Unknown1188 { get; set; } + public ushort Unknown1189 { get; set; } + public ushort Unknown1190 { get; set; } + public ushort Unknown1191 { get; set; } + public ushort Unknown1192 { get; set; } + public ushort Unknown1193 { get; set; } + public ushort Unknown1194 { get; set; } + public ushort Unknown1195 { get; set; } + public ushort Unknown1196 { get; set; } + public ushort Unknown1197 { get; set; } + public ushort Unknown1198 { get; set; } + public ushort Unknown1199 { get; set; } + public ushort Unknown1200 { get; set; } + public LazyRow< Quest >[] QuestItem { get; set; } + public int[] Unknown { get; set; } + public LazyRow< Achievement >[] AchievementUnlock { get; set; } + public byte Unknown1381 { get; set; } + public byte Unknown1382 { get; set; } + public byte Unknown1383 { get; set; } + public byte Unknown1384 { get; set; } + public byte Unknown1385 { get; set; } + public byte Unknown1386 { get; set; } + public byte Unknown1387 { get; set; } + public byte Unknown1388 { get; set; } + public byte Unknown1389 { get; set; } + public byte Unknown1390 { get; set; } + public byte Unknown1391 { get; set; } + public byte Unknown1392 { get; set; } + public byte Unknown1393 { get; set; } + public byte Unknown1394 { get; set; } + public byte Unknown1395 { get; set; } + public byte Unknown1396 { get; set; } + public byte Unknown1397 { get; set; } + public byte Unknown1398 { get; set; } + public byte Unknown1399 { get; set; } + public byte Unknown1400 { get; set; } + public byte Unknown1401 { get; set; } + public byte Unknown1402 { get; set; } + public byte Unknown1403 { get; set; } + public byte Unknown1404 { get; set; } + public byte Unknown1405 { get; set; } + public byte Unknown1406 { get; set; } + public byte Unknown1407 { get; set; } + public byte Unknown1408 { get; set; } + public byte Unknown1409 { get; set; } + public byte Unknown1410 { get; set; } + public byte Unknown1411 { get; set; } + public byte Unknown1412 { get; set; } + public byte Unknown1413 { get; set; } + public byte Unknown1414 { get; set; } + public byte Unknown1415 { get; set; } + public byte Unknown1416 { get; set; } + public byte Unknown1417 { get; set; } + public byte Unknown1418 { get; set; } + public byte Unknown1419 { get; set; } + public byte Unknown1420 { get; set; } + public byte Unknown1421 { get; set; } + public byte Unknown1422 { get; set; } + public byte Unknown1423 { get; set; } + public byte Unknown1424 { get; set; } + public byte Unknown1425 { get; set; } + public byte Unknown1426 { get; set; } + public byte Unknown1427 { get; set; } + public byte Unknown1428 { get; set; } + public byte Unknown1429 { get; set; } + public byte Unknown1430 { get; set; } + public byte Unknown1431 { get; set; } + public byte Unknown1432 { get; set; } + public byte Unknown1433 { get; set; } + public byte Unknown1434 { get; set; } + public byte Unknown1435 { get; set; } + public byte Unknown1436 { get; set; } + public byte Unknown1437 { get; set; } + public byte Unknown1438 { get; set; } + public byte Unknown1439 { get; set; } + public byte Unknown1440 { get; set; } + public ushort[] PatchNumber { get; set; } + public byte UseCurrencyType { get; set; } + public LazyRow< Quest > QuestUnlock { get; set; } + public LazyRow< DefaultTalk > CompleteText { get; set; } + public LazyRow< DefaultTalk > NotCompleteText { get; set; } + public uint Unknown1505 { get; set; } + public bool Unknown1506 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); UnkStruct1 = new UnkStruct1Struct[ 2 ]; @@ -2487,13 +2483,13 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) Unknown1200 = parser.ReadColumn< ushort >( 1200 ); QuestItem = new LazyRow< Quest >[ 60 ]; for( var i = 0; i < 60; i++ ) - QuestItem[ i ] = new LazyRow< Quest >( lumina, parser.ReadColumn< int >( 1201 + i ), language ); + QuestItem[ i ] = new LazyRow< Quest >( gameData, parser.ReadColumn< int >( 1201 + i ), language ); Unknown = new int[ 60 ]; for( var i = 0; i < 60; i++ ) Unknown[ i ] = parser.ReadColumn< int >( 1261 + i ); AchievementUnlock = new LazyRow< Achievement >[ 60 ]; for( var i = 0; i < 60; i++ ) - AchievementUnlock[ i ] = new LazyRow< Achievement >( lumina, parser.ReadColumn< int >( 1321 + i ), language ); + AchievementUnlock[ i ] = new LazyRow< Achievement >( gameData, parser.ReadColumn< int >( 1321 + i ), language ); Unknown1381 = parser.ReadColumn< byte >( 1381 ); Unknown1382 = parser.ReadColumn< byte >( 1382 ); Unknown1383 = parser.ReadColumn< byte >( 1383 ); @@ -2558,9 +2554,9 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) for( var i = 0; i < 60; i++ ) PatchNumber[ i ] = parser.ReadColumn< ushort >( 1441 + i ); UseCurrencyType = parser.ReadColumn< byte >( 1501 ); - QuestUnlock = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 1502 ), language ); - CompleteText = new LazyRow< DefaultTalk >( lumina, parser.ReadColumn< int >( 1503 ), language ); - NotCompleteText = new LazyRow< DefaultTalk >( lumina, parser.ReadColumn< int >( 1504 ), language ); + QuestUnlock = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 1502 ), language ); + CompleteText = new LazyRow< DefaultTalk >( gameData, parser.ReadColumn< int >( 1503 ), language ); + NotCompleteText = new LazyRow< DefaultTalk >( gameData, parser.ReadColumn< int >( 1504 ), language ); Unknown1505 = parser.ReadColumn< uint >( 1505 ); Unknown1506 = parser.ReadColumn< bool >( 1506 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/SpecialShopItemCategory.cs b/src/Lumina.Excel/GeneratedSheets/SpecialShopItemCategory.cs index d493a588..c2df91d1 100644 --- a/src/Lumina.Excel/GeneratedSheets/SpecialShopItemCategory.cs +++ b/src/Lumina.Excel/GeneratedSheets/SpecialShopItemCategory.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "SpecialShopItemCategory", columnHash: 0xdebb20e3 )] - public class SpecialShopItemCategory : IExcelRow + public class SpecialShopItemCategory : ExcelRow { - public SeString Name; + public SeString Name { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/Stain.cs b/src/Lumina.Excel/GeneratedSheets/Stain.cs index 870b3f0c..f4db1f2a 100644 --- a/src/Lumina.Excel/GeneratedSheets/Stain.cs +++ b/src/Lumina.Excel/GeneratedSheets/Stain.cs @@ -7,23 +7,19 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Stain", columnHash: 0xa2420e68 )] - public class Stain : IExcelRow + public class Stain : ExcelRow { - public uint Color; - public byte Shade; - public byte Unknown2; - public SeString Name; - public bool Unknown4; - public bool Unknown5; + public uint Color { get; set; } + public byte Shade { get; set; } + public byte Unknown2 { get; set; } + public SeString Name { get; set; } + public bool Unknown4 { get; set; } + public bool Unknown5 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Color = parser.ReadColumn< uint >( 0 ); Shade = parser.ReadColumn< byte >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/StainTransient.cs b/src/Lumina.Excel/GeneratedSheets/StainTransient.cs index 2089d4ce..719f4ca9 100644 --- a/src/Lumina.Excel/GeneratedSheets/StainTransient.cs +++ b/src/Lumina.Excel/GeneratedSheets/StainTransient.cs @@ -7,22 +7,18 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "StainTransient", columnHash: 0x5d58cc84 )] - public class StainTransient : IExcelRow + public class StainTransient : ExcelRow { - public LazyRow< Item > Item1; - public LazyRow< Item > Item2; + public LazyRow< Item > Item1 { get; set; } + public LazyRow< Item > Item2 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Item1 = new LazyRow< Item >( lumina, parser.ReadColumn< uint >( 0 ), language ); - Item2 = new LazyRow< Item >( lumina, parser.ReadColumn< uint >( 1 ), language ); + Item1 = new LazyRow< Item >( gameData, parser.ReadColumn< uint >( 0 ), language ); + Item2 = new LazyRow< Item >( gameData, parser.ReadColumn< uint >( 1 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/Status.cs b/src/Lumina.Excel/GeneratedSheets/Status.cs index f96d24a6..b1d93546 100644 --- a/src/Lumina.Excel/GeneratedSheets/Status.cs +++ b/src/Lumina.Excel/GeneratedSheets/Status.cs @@ -7,47 +7,43 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Status", columnHash: 0xec4473bc )] - public class Status : IExcelRow + public class Status : ExcelRow { - public SeString Name; - public SeString Description; - public ushort Icon; - public byte MaxStacks; - public byte Unknown4; - public byte Category; - public LazyRow< StatusHitEffect > HitEffect; - public LazyRow< StatusLoopVFX > VFX; - public bool LockMovement; - public bool Unknown9; - public bool LockActions; - public bool LockControl; - public bool Transfiguration; - public bool Unknown13; - public bool CanDispel; - public bool InflictedByActor; - public bool IsPermanent; - public byte PartyListPriority; - public bool Unknown18; - public bool Unknown19; - public bool Unknown20; - public short Unknown21; - public byte Unknown22; - public bool Unknown23; - public ushort Log; - public bool IsFcBuff; - public bool Invisibility; - public byte Unknown27; - public byte Unknown28; - public bool Unknown29; + public SeString Name { get; set; } + public SeString Description { get; set; } + public ushort Icon { get; set; } + public byte MaxStacks { get; set; } + public byte Unknown4 { get; set; } + public byte Category { get; set; } + public LazyRow< StatusHitEffect > HitEffect { get; set; } + public LazyRow< StatusLoopVFX > VFX { get; set; } + public bool LockMovement { get; set; } + public bool Unknown9 { get; set; } + public bool LockActions { get; set; } + public bool LockControl { get; set; } + public bool Transfiguration { get; set; } + public bool Unknown13 { get; set; } + public bool CanDispel { get; set; } + public bool InflictedByActor { get; set; } + public bool IsPermanent { get; set; } + public byte PartyListPriority { get; set; } + public bool Unknown18 { get; set; } + public bool Unknown19 { get; set; } + public bool Unknown20 { get; set; } + public short Unknown21 { get; set; } + public byte Unknown22 { get; set; } + public bool Unknown23 { get; set; } + public ushort Log { get; set; } + public bool IsFcBuff { get; set; } + public bool Invisibility { get; set; } + public byte Unknown27 { get; set; } + public byte Unknown28 { get; set; } + public bool Unknown29 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); Description = parser.ReadColumn< SeString >( 1 ); @@ -55,8 +51,8 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) MaxStacks = parser.ReadColumn< byte >( 3 ); Unknown4 = parser.ReadColumn< byte >( 4 ); Category = parser.ReadColumn< byte >( 5 ); - HitEffect = new LazyRow< StatusHitEffect >( lumina, parser.ReadColumn< byte >( 6 ), language ); - VFX = new LazyRow< StatusLoopVFX >( lumina, parser.ReadColumn< ushort >( 7 ), language ); + HitEffect = new LazyRow< StatusHitEffect >( gameData, parser.ReadColumn< byte >( 6 ), language ); + VFX = new LazyRow< StatusLoopVFX >( gameData, parser.ReadColumn< ushort >( 7 ), language ); LockMovement = parser.ReadColumn< bool >( 8 ); Unknown9 = parser.ReadColumn< bool >( 9 ); LockActions = parser.ReadColumn< bool >( 10 ); diff --git a/src/Lumina.Excel/GeneratedSheets/StatusHitEffect.cs b/src/Lumina.Excel/GeneratedSheets/StatusHitEffect.cs index 18f42f08..0dae4d1f 100644 --- a/src/Lumina.Excel/GeneratedSheets/StatusHitEffect.cs +++ b/src/Lumina.Excel/GeneratedSheets/StatusHitEffect.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "StatusHitEffect", columnHash: 0xd870e208 )] - public class StatusHitEffect : IExcelRow + public class StatusHitEffect : ExcelRow { - public LazyRow< VFX > Location; + public LazyRow< VFX > Location { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Location = new LazyRow< VFX >( lumina, parser.ReadColumn< ushort >( 0 ), language ); + Location = new LazyRow< VFX >( gameData, parser.ReadColumn< ushort >( 0 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/StatusLoopVFX.cs b/src/Lumina.Excel/GeneratedSheets/StatusLoopVFX.cs index 58f90f43..33fb8868 100644 --- a/src/Lumina.Excel/GeneratedSheets/StatusLoopVFX.cs +++ b/src/Lumina.Excel/GeneratedSheets/StatusLoopVFX.cs @@ -7,32 +7,28 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "StatusLoopVFX", columnHash: 0xaa82c4a9 )] - public class StatusLoopVFX : IExcelRow + public class StatusLoopVFX : ExcelRow { - public LazyRow< VFX > VFX; - public byte Unknown1; - public LazyRow< VFX > VFX2; - public byte Unknown3; - public LazyRow< VFX > VFX3; - public byte Unknown5; - public byte Unknown6; - public bool Unknown7; - public bool Unknown8; + public LazyRow< VFX > VFX { get; set; } + public byte Unknown1 { get; set; } + public LazyRow< VFX > VFX2 { get; set; } + public byte Unknown3 { get; set; } + public LazyRow< VFX > VFX3 { get; set; } + public byte Unknown5 { get; set; } + public byte Unknown6 { get; set; } + public bool Unknown7 { get; set; } + public bool Unknown8 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - VFX = new LazyRow< VFX >( lumina, parser.ReadColumn< ushort >( 0 ), language ); + VFX = new LazyRow< VFX >( gameData, parser.ReadColumn< ushort >( 0 ), language ); Unknown1 = parser.ReadColumn< byte >( 1 ); - VFX2 = new LazyRow< VFX >( lumina, parser.ReadColumn< ushort >( 2 ), language ); + VFX2 = new LazyRow< VFX >( gameData, parser.ReadColumn< ushort >( 2 ), language ); Unknown3 = parser.ReadColumn< byte >( 3 ); - VFX3 = new LazyRow< VFX >( lumina, parser.ReadColumn< ushort >( 4 ), language ); + VFX3 = new LazyRow< VFX >( gameData, parser.ReadColumn< ushort >( 4 ), language ); Unknown5 = parser.ReadColumn< byte >( 5 ); Unknown6 = parser.ReadColumn< byte >( 6 ); Unknown7 = parser.ReadColumn< bool >( 7 ); diff --git a/src/Lumina.Excel/GeneratedSheets/Story.cs b/src/Lumina.Excel/GeneratedSheets/Story.cs index 9208e4af..023cfe4c 100644 --- a/src/Lumina.Excel/GeneratedSheets/Story.cs +++ b/src/Lumina.Excel/GeneratedSheets/Story.cs @@ -7,39 +7,35 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Story", columnHash: 0xcaeee7ab )] - public class Story : IExcelRow + public class Story : ExcelRow { - public SeString Script; - public SeString[] Instruction; - public uint[] Argument; - public ushort[] Sequence; - public byte[] CompletedQuestOperator; - public LazyRow< Quest >[] CompletedQuest0; - public LazyRow< Quest >[] CompletedQuest1; - public LazyRow< Quest >[] CompletedQuest2; - public byte[] AcceptedQuestOperator; - public LazyRow< Quest >[] AcceptedQuest0; - public byte[] AcceptedQuestSequence0; - public LazyRow< Quest >[] AcceptedQuest1; - public byte[] AcceptedQuestSequence1; - public LazyRow< Quest >[] AcceptedQuest2; - public byte[] AcceptedQuestSequence2; - public uint[] LayerSet0; - public uint[] LayerSet1; - public ushort[] SequenceBegin; - public ushort[] SequenceEnd; - public uint[] Listener; - public LazyRow< TerritoryType > LayerSetTerritoryType0; - public LazyRow< TerritoryType > LayerSetTerritoryType1; + public SeString Script { get; set; } + public SeString[] Instruction { get; set; } + public uint[] Argument { get; set; } + public ushort[] Sequence { get; set; } + public byte[] CompletedQuestOperator { get; set; } + public LazyRow< Quest >[] CompletedQuest0 { get; set; } + public LazyRow< Quest >[] CompletedQuest1 { get; set; } + public LazyRow< Quest >[] CompletedQuest2 { get; set; } + public byte[] AcceptedQuestOperator { get; set; } + public LazyRow< Quest >[] AcceptedQuest0 { get; set; } + public byte[] AcceptedQuestSequence0 { get; set; } + public LazyRow< Quest >[] AcceptedQuest1 { get; set; } + public byte[] AcceptedQuestSequence1 { get; set; } + public LazyRow< Quest >[] AcceptedQuest2 { get; set; } + public byte[] AcceptedQuestSequence2 { get; set; } + public uint[] LayerSet0 { get; set; } + public uint[] LayerSet1 { get; set; } + public ushort[] SequenceBegin { get; set; } + public ushort[] SequenceEnd { get; set; } + public uint[] Listener { get; set; } + public LazyRow< TerritoryType > LayerSetTerritoryType0 { get; set; } + public LazyRow< TerritoryType > LayerSetTerritoryType1 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Script = parser.ReadColumn< SeString >( 0 ); Instruction = new SeString[ 40 ]; @@ -56,31 +52,31 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) CompletedQuestOperator[ i ] = parser.ReadColumn< byte >( 191 + i ); CompletedQuest0 = new LazyRow< Quest >[ 110 ]; for( var i = 0; i < 110; i++ ) - CompletedQuest0[ i ] = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 301 + i ), language ); + CompletedQuest0[ i ] = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 301 + i ), language ); CompletedQuest1 = new LazyRow< Quest >[ 110 ]; for( var i = 0; i < 110; i++ ) - CompletedQuest1[ i ] = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 411 + i ), language ); + CompletedQuest1[ i ] = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 411 + i ), language ); CompletedQuest2 = new LazyRow< Quest >[ 110 ]; for( var i = 0; i < 110; i++ ) - CompletedQuest2[ i ] = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 521 + i ), language ); + CompletedQuest2[ i ] = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 521 + i ), language ); AcceptedQuestOperator = new byte[ 110 ]; for( var i = 0; i < 110; i++ ) AcceptedQuestOperator[ i ] = parser.ReadColumn< byte >( 631 + i ); AcceptedQuest0 = new LazyRow< Quest >[ 110 ]; for( var i = 0; i < 110; i++ ) - AcceptedQuest0[ i ] = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 741 + i ), language ); + AcceptedQuest0[ i ] = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 741 + i ), language ); AcceptedQuestSequence0 = new byte[ 110 ]; for( var i = 0; i < 110; i++ ) AcceptedQuestSequence0[ i ] = parser.ReadColumn< byte >( 851 + i ); AcceptedQuest1 = new LazyRow< Quest >[ 110 ]; for( var i = 0; i < 110; i++ ) - AcceptedQuest1[ i ] = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 961 + i ), language ); + AcceptedQuest1[ i ] = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 961 + i ), language ); AcceptedQuestSequence1 = new byte[ 110 ]; for( var i = 0; i < 110; i++ ) AcceptedQuestSequence1[ i ] = parser.ReadColumn< byte >( 1071 + i ); AcceptedQuest2 = new LazyRow< Quest >[ 110 ]; for( var i = 0; i < 110; i++ ) - AcceptedQuest2[ i ] = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 1181 + i ), language ); + AcceptedQuest2[ i ] = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 1181 + i ), language ); AcceptedQuestSequence2 = new byte[ 110 ]; for( var i = 0; i < 110; i++ ) AcceptedQuestSequence2[ i ] = parser.ReadColumn< byte >( 1291 + i ); @@ -99,8 +95,8 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) Listener = new uint[ 80 ]; for( var i = 0; i < 80; i++ ) Listener[ i ] = parser.ReadColumn< uint >( 1781 + i ); - LayerSetTerritoryType0 = new LazyRow< TerritoryType >( lumina, parser.ReadColumn< ushort >( 1861 ), language ); - LayerSetTerritoryType1 = new LazyRow< TerritoryType >( lumina, parser.ReadColumn< ushort >( 1862 ), language ); + LayerSetTerritoryType0 = new LazyRow< TerritoryType >( gameData, parser.ReadColumn< ushort >( 1861 ), language ); + LayerSetTerritoryType1 = new LazyRow< TerritoryType >( gameData, parser.ReadColumn< ushort >( 1862 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/SubmarineExploration.cs b/src/Lumina.Excel/GeneratedSheets/SubmarineExploration.cs index 77c1e45b..9029c36e 100644 --- a/src/Lumina.Excel/GeneratedSheets/SubmarineExploration.cs +++ b/src/Lumina.Excel/GeneratedSheets/SubmarineExploration.cs @@ -7,37 +7,33 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "SubmarineExploration", columnHash: 0xff922bb4 )] - public class SubmarineExploration : IExcelRow + public class SubmarineExploration : ExcelRow { - public SeString Destination; - public SeString Location; - public short Unknown2; - public short Unknown3; - public short Unknown4; - public LazyRow< SubmarineMap > Map; - public bool Unknown6; - public byte Stars; - public byte RankReq; - public byte CeruleumTankReq; - public ushort Durationmin; - public byte DistanceForSurvey; - public uint ExpReward; + public SeString Destination { get; set; } + public SeString Location { get; set; } + public short Unknown2 { get; set; } + public short Unknown3 { get; set; } + public short Unknown4 { get; set; } + public LazyRow< SubmarineMap > Map { get; set; } + public bool Unknown6 { get; set; } + public byte Stars { get; set; } + public byte RankReq { get; set; } + public byte CeruleumTankReq { get; set; } + public ushort Durationmin { get; set; } + public byte DistanceForSurvey { get; set; } + public uint ExpReward { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Destination = parser.ReadColumn< SeString >( 0 ); Location = parser.ReadColumn< SeString >( 1 ); Unknown2 = parser.ReadColumn< short >( 2 ); Unknown3 = parser.ReadColumn< short >( 3 ); Unknown4 = parser.ReadColumn< short >( 4 ); - Map = new LazyRow< SubmarineMap >( lumina, parser.ReadColumn< byte >( 5 ), language ); + Map = new LazyRow< SubmarineMap >( gameData, parser.ReadColumn< byte >( 5 ), language ); Unknown6 = parser.ReadColumn< bool >( 6 ); Stars = parser.ReadColumn< byte >( 7 ); RankReq = parser.ReadColumn< byte >( 8 ); diff --git a/src/Lumina.Excel/GeneratedSheets/SubmarineMap.cs b/src/Lumina.Excel/GeneratedSheets/SubmarineMap.cs index 588a4611..dadaa5dd 100644 --- a/src/Lumina.Excel/GeneratedSheets/SubmarineMap.cs +++ b/src/Lumina.Excel/GeneratedSheets/SubmarineMap.cs @@ -7,19 +7,15 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "SubmarineMap", columnHash: 0x98fff20a )] - public class SubmarineMap : IExcelRow + public class SubmarineMap : ExcelRow { - public SeString Name; - public uint Image; + public SeString Name { get; set; } + public uint Image { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); Image = parser.ReadColumn< uint >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/SubmarinePart.cs b/src/Lumina.Excel/GeneratedSheets/SubmarinePart.cs index 85ae844a..5c716558 100644 --- a/src/Lumina.Excel/GeneratedSheets/SubmarinePart.cs +++ b/src/Lumina.Excel/GeneratedSheets/SubmarinePart.cs @@ -7,27 +7,23 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "SubmarinePart", columnHash: 0xc971f464 )] - public class SubmarinePart : IExcelRow + public class SubmarinePart : ExcelRow { - public byte Slot; - public byte Rank; - public byte Components; - public short Surveillance; - public short Retrieval; - public short Speed; - public short Range; - public short Favor; - public ushort Unknown8; - public byte RepairMaterials; + public byte Slot { get; set; } + public byte Rank { get; set; } + public byte Components { get; set; } + public short Surveillance { get; set; } + public short Retrieval { get; set; } + public short Speed { get; set; } + public short Range { get; set; } + public short Favor { get; set; } + public ushort Class { get; set; } + public byte RepairMaterials { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Slot = parser.ReadColumn< byte >( 0 ); Rank = parser.ReadColumn< byte >( 1 ); @@ -37,7 +33,7 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) Speed = parser.ReadColumn< short >( 5 ); Range = parser.ReadColumn< short >( 6 ); Favor = parser.ReadColumn< short >( 7 ); - Unknown8 = parser.ReadColumn< ushort >( 8 ); + Class = parser.ReadColumn< ushort >( 8 ); RepairMaterials = parser.ReadColumn< byte >( 9 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/SubmarineRank.cs b/src/Lumina.Excel/GeneratedSheets/SubmarineRank.cs index 9a8b604f..4b48fe22 100644 --- a/src/Lumina.Excel/GeneratedSheets/SubmarineRank.cs +++ b/src/Lumina.Excel/GeneratedSheets/SubmarineRank.cs @@ -7,24 +7,20 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "SubmarineRank", columnHash: 0x697b9c75 )] - public class SubmarineRank : IExcelRow + public class SubmarineRank : ExcelRow { - public ushort Capacity; - public uint ExpToNext; - public byte SurveillanceBonus; - public byte RetrievalBonus; - public byte SpeedBonus; - public byte RangeBonus; - public byte FavorBonus; + public ushort Capacity { get; set; } + public uint ExpToNext { get; set; } + public byte SurveillanceBonus { get; set; } + public byte RetrievalBonus { get; set; } + public byte SpeedBonus { get; set; } + public byte RangeBonus { get; set; } + public byte FavorBonus { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Capacity = parser.ReadColumn< ushort >( 0 ); ExpToNext = parser.ReadColumn< uint >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/SwitchTalk.cs b/src/Lumina.Excel/GeneratedSheets/SwitchTalk.cs index f9de5409..516e1de9 100644 --- a/src/Lumina.Excel/GeneratedSheets/SwitchTalk.cs +++ b/src/Lumina.Excel/GeneratedSheets/SwitchTalk.cs @@ -7,19 +7,15 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "SwitchTalk", columnHash: 0x4be042fe )] - public class SwitchTalk : IExcelRow + public class SwitchTalk : ExcelRow { - public uint Unknown0; - public bool Unknown1; + public uint Unknown0 { get; set; } + public bool Unknown1 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< uint >( 0 ); Unknown1 = parser.ReadColumn< bool >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/SwitchTalkVariation.cs b/src/Lumina.Excel/GeneratedSheets/SwitchTalkVariation.cs index 58693ada..b8aa6901 100644 --- a/src/Lumina.Excel/GeneratedSheets/SwitchTalkVariation.cs +++ b/src/Lumina.Excel/GeneratedSheets/SwitchTalkVariation.cs @@ -7,26 +7,22 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "SwitchTalkVariation", columnHash: 0x031e9614 )] - public class SwitchTalkVariation : IExcelRow + public class SwitchTalkVariation : ExcelRow { - public uint Quest0; - public LazyRow< Quest > Quest1; - public byte Unknown2; - public LazyRow< DefaultTalk > DefaultTalk; + public uint Quest0 { get; set; } + public LazyRow< Quest > Quest1 { get; set; } + public byte Unknown2 { get; set; } + public LazyRow< DefaultTalk > DefaultTalk { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Quest0 = parser.ReadColumn< uint >( 0 ); - Quest1 = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 1 ), language ); + Quest1 = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 1 ), language ); Unknown2 = parser.ReadColumn< byte >( 2 ); - DefaultTalk = new LazyRow< DefaultTalk >( lumina, parser.ReadColumn< uint >( 3 ), language ); + DefaultTalk = new LazyRow< DefaultTalk >( gameData, parser.ReadColumn< uint >( 3 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/TerritoryType.cs b/src/Lumina.Excel/GeneratedSheets/TerritoryType.cs index 1e5c7923..3aec1423 100644 --- a/src/Lumina.Excel/GeneratedSheets/TerritoryType.cs +++ b/src/Lumina.Excel/GeneratedSheets/TerritoryType.cs @@ -7,66 +7,62 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "TerritoryType", columnHash: 0xb7598447 )] - public class TerritoryType : IExcelRow + public class TerritoryType : ExcelRow { - public SeString Name; - public SeString Bg; - public byte BattalionMode; - public LazyRow< PlaceName > PlaceNameRegion; - public LazyRow< PlaceName > PlaceNameZone; - public LazyRow< PlaceName > PlaceName; - public LazyRow< Map > Map; - public byte LoadingImage; - public byte ExclusiveType; - public byte TerritoryIntendedUse; - public ushort Unknown10; - public bool Unknown11; - public byte WeatherRate; - public bool Unknown13; - public byte Unknown14; - public bool PCSearch; - public bool Stealth; - public bool Mount; - public bool Unknown18; - public LazyRow< BGM > BGM; - public int PlaceNameRegionIcon; - public int PlaceNameIcon; - public LazyRow< ArrayEventHandler > ArrayEventHandler; - public LazyRow< QuestBattle > QuestBattle; - public LazyRow< Aetheryte > Aetheryte; - public int FixedTime; - public ushort Resident; - public sbyte AchievementIndex; - public bool IsPvpZone; - public LazyRow< ExVersion > ExVersion; - public byte Unknown30; - public byte Unknown31; - public byte AddedIn53; - public LazyRow< MountSpeed > MountSpeed; - public bool Unknown34; - public bool Unknown35; - public byte Unknown36; - public bool Unknown37; - public bool Unknown38; - public bool Unknown39; - public bool Unknown54; + public SeString Name { get; set; } + public SeString Bg { get; set; } + public byte BattalionMode { get; set; } + public LazyRow< PlaceName > PlaceNameRegion { get; set; } + public LazyRow< PlaceName > PlaceNameZone { get; set; } + public LazyRow< PlaceName > PlaceName { get; set; } + public LazyRow< Map > Map { get; set; } + public byte LoadingImage { get; set; } + public byte ExclusiveType { get; set; } + public byte TerritoryIntendedUse { get; set; } + public ushort Unknown10 { get; set; } + public bool Unknown11 { get; set; } + public byte WeatherRate { get; set; } + public bool Unknown13 { get; set; } + public byte Unknown14 { get; set; } + public bool PCSearch { get; set; } + public bool Stealth { get; set; } + public bool Mount { get; set; } + public bool Unknown18 { get; set; } + public LazyRow< BGM > BGM { get; set; } + public int PlaceNameRegionIcon { get; set; } + public int PlaceNameIcon { get; set; } + public LazyRow< ArrayEventHandler > ArrayEventHandler { get; set; } + public LazyRow< QuestBattle > QuestBattle { get; set; } + public LazyRow< Aetheryte > Aetheryte { get; set; } + public int FixedTime { get; set; } + public ushort Resident { get; set; } + public sbyte AchievementIndex { get; set; } + public bool IsPvpZone { get; set; } + public LazyRow< ExVersion > ExVersion { get; set; } + public byte Unknown30 { get; set; } + public byte Unknown31 { get; set; } + public byte AddedIn53 { get; set; } + public LazyRow< MountSpeed > MountSpeed { get; set; } + public bool Unknown34 { get; set; } + public bool Unknown35 { get; set; } + public byte Unknown36 { get; set; } + public bool Unknown37 { get; set; } + public bool Unknown38 { get; set; } + public bool Unknown39 { get; set; } + public bool Unknown54 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); Bg = parser.ReadColumn< SeString >( 1 ); BattalionMode = parser.ReadColumn< byte >( 2 ); - PlaceNameRegion = new LazyRow< PlaceName >( lumina, parser.ReadColumn< ushort >( 3 ), language ); - PlaceNameZone = new LazyRow< PlaceName >( lumina, parser.ReadColumn< ushort >( 4 ), language ); - PlaceName = new LazyRow< PlaceName >( lumina, parser.ReadColumn< ushort >( 5 ), language ); - Map = new LazyRow< Map >( lumina, parser.ReadColumn< ushort >( 6 ), language ); + PlaceNameRegion = new LazyRow< PlaceName >( gameData, parser.ReadColumn< ushort >( 3 ), language ); + PlaceNameZone = new LazyRow< PlaceName >( gameData, parser.ReadColumn< ushort >( 4 ), language ); + PlaceName = new LazyRow< PlaceName >( gameData, parser.ReadColumn< ushort >( 5 ), language ); + Map = new LazyRow< Map >( gameData, parser.ReadColumn< ushort >( 6 ), language ); LoadingImage = parser.ReadColumn< byte >( 7 ); ExclusiveType = parser.ReadColumn< byte >( 8 ); TerritoryIntendedUse = parser.ReadColumn< byte >( 9 ); @@ -79,21 +75,21 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) Stealth = parser.ReadColumn< bool >( 16 ); Mount = parser.ReadColumn< bool >( 17 ); Unknown18 = parser.ReadColumn< bool >( 18 ); - BGM = new LazyRow< BGM >( lumina, parser.ReadColumn< ushort >( 19 ), language ); + BGM = new LazyRow< BGM >( gameData, parser.ReadColumn< ushort >( 19 ), language ); PlaceNameRegionIcon = parser.ReadColumn< int >( 20 ); PlaceNameIcon = parser.ReadColumn< int >( 21 ); - ArrayEventHandler = new LazyRow< ArrayEventHandler >( lumina, parser.ReadColumn< uint >( 22 ), language ); - QuestBattle = new LazyRow< QuestBattle >( lumina, parser.ReadColumn< ushort >( 23 ), language ); - Aetheryte = new LazyRow< Aetheryte >( lumina, parser.ReadColumn< int >( 24 ), language ); + ArrayEventHandler = new LazyRow< ArrayEventHandler >( gameData, parser.ReadColumn< uint >( 22 ), language ); + QuestBattle = new LazyRow< QuestBattle >( gameData, parser.ReadColumn< ushort >( 23 ), language ); + Aetheryte = new LazyRow< Aetheryte >( gameData, parser.ReadColumn< int >( 24 ), language ); FixedTime = parser.ReadColumn< int >( 25 ); Resident = parser.ReadColumn< ushort >( 26 ); AchievementIndex = parser.ReadColumn< sbyte >( 27 ); IsPvpZone = parser.ReadColumn< bool >( 28 ); - ExVersion = new LazyRow< ExVersion >( lumina, parser.ReadColumn< byte >( 29 ), language ); + ExVersion = new LazyRow< ExVersion >( gameData, parser.ReadColumn< byte >( 29 ), language ); Unknown30 = parser.ReadColumn< byte >( 30 ); Unknown31 = parser.ReadColumn< byte >( 31 ); AddedIn53 = parser.ReadColumn< byte >( 32 ); - MountSpeed = new LazyRow< MountSpeed >( lumina, parser.ReadColumn< byte >( 33 ), language ); + MountSpeed = new LazyRow< MountSpeed >( gameData, parser.ReadColumn< byte >( 33 ), language ); Unknown34 = parser.ReadColumn< bool >( 34 ); Unknown35 = parser.ReadColumn< bool >( 35 ); Unknown36 = parser.ReadColumn< byte >( 36 ); diff --git a/src/Lumina.Excel/GeneratedSheets/TerritoryTypeTransient.cs b/src/Lumina.Excel/GeneratedSheets/TerritoryTypeTransient.cs index 83da852e..dcd20e6c 100644 --- a/src/Lumina.Excel/GeneratedSheets/TerritoryTypeTransient.cs +++ b/src/Lumina.Excel/GeneratedSheets/TerritoryTypeTransient.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "TerritoryTypeTransient", columnHash: 0xd9b2883f )] - public class TerritoryTypeTransient : IExcelRow + public class TerritoryTypeTransient : ExcelRow { - public short OffsetZ; + public short OffsetZ { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); OffsetZ = parser.ReadColumn< short >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/TextCommand.cs b/src/Lumina.Excel/GeneratedSheets/TextCommand.cs index 0006f44f..19f10ccd 100644 --- a/src/Lumina.Excel/GeneratedSheets/TextCommand.cs +++ b/src/Lumina.Excel/GeneratedSheets/TextCommand.cs @@ -7,29 +7,25 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "TextCommand", columnHash: 0x5d4b4e4b )] - public class TextCommand : IExcelRow + public class TextCommand : ExcelRow { - public byte Unknown0; - public byte Unknown1; - public sbyte Unknown2; - public sbyte Unknown3; - public sbyte Unknown4; - public SeString Command; - public SeString ShortCommand; - public SeString Description; - public SeString Alias; - public SeString ShortAlias; - public ushort Unknown10; - public uint Unknown11; + public byte Unknown0 { get; set; } + public byte Unknown1 { get; set; } + public sbyte Unknown2 { get; set; } + public sbyte Unknown3 { get; set; } + public sbyte Unknown4 { get; set; } + public SeString Command { get; set; } + public SeString ShortCommand { get; set; } + public SeString Description { get; set; } + public SeString Alias { get; set; } + public SeString ShortAlias { get; set; } + public ushort Unknown10 { get; set; } + public uint Unknown11 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< byte >( 0 ); Unknown1 = parser.ReadColumn< byte >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/Title.cs b/src/Lumina.Excel/GeneratedSheets/Title.cs index 982884c0..eda17a2b 100644 --- a/src/Lumina.Excel/GeneratedSheets/Title.cs +++ b/src/Lumina.Excel/GeneratedSheets/Title.cs @@ -7,21 +7,17 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Title", columnHash: 0x83e3f9ba )] - public class Title : IExcelRow + public class Title : ExcelRow { - public SeString Masculine; - public SeString Feminine; - public bool IsPrefix; - public ushort Order; + public SeString Masculine { get; set; } + public SeString Feminine { get; set; } + public bool IsPrefix { get; set; } + public ushort Order { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Masculine = parser.ReadColumn< SeString >( 0 ); Feminine = parser.ReadColumn< SeString >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/Tomestones.cs b/src/Lumina.Excel/GeneratedSheets/Tomestones.cs index 3df77695..e53f7eef 100644 --- a/src/Lumina.Excel/GeneratedSheets/Tomestones.cs +++ b/src/Lumina.Excel/GeneratedSheets/Tomestones.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Tomestones", columnHash: 0xd870e208 )] - public class Tomestones : IExcelRow + public class Tomestones : ExcelRow { - public ushort WeeklyLimit; + public ushort WeeklyLimit { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); WeeklyLimit = parser.ReadColumn< ushort >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/TomestonesItem.cs b/src/Lumina.Excel/GeneratedSheets/TomestonesItem.cs index e7573b05..f7fd3114 100644 --- a/src/Lumina.Excel/GeneratedSheets/TomestonesItem.cs +++ b/src/Lumina.Excel/GeneratedSheets/TomestonesItem.cs @@ -7,24 +7,20 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "TomestonesItem", columnHash: 0xc8901190 )] - public class TomestonesItem : IExcelRow + public class TomestonesItem : ExcelRow { - public LazyRow< Item > Item; - public sbyte Unknown1; - public LazyRow< Tomestones > Tomestones; + public LazyRow< Item > Item { get; set; } + public sbyte Unknown1 { get; set; } + public LazyRow< Tomestones > Tomestones { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Item = new LazyRow< Item >( lumina, parser.ReadColumn< int >( 0 ), language ); + Item = new LazyRow< Item >( gameData, parser.ReadColumn< int >( 0 ), language ); Unknown1 = parser.ReadColumn< sbyte >( 1 ); - Tomestones = new LazyRow< Tomestones >( lumina, parser.ReadColumn< int >( 2 ), language ); + Tomestones = new LazyRow< Tomestones >( gameData, parser.ReadColumn< int >( 2 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/TopicSelect.cs b/src/Lumina.Excel/GeneratedSheets/TopicSelect.cs index 0fa86a40..fbffd5d3 100644 --- a/src/Lumina.Excel/GeneratedSheets/TopicSelect.cs +++ b/src/Lumina.Excel/GeneratedSheets/TopicSelect.cs @@ -7,26 +7,22 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "TopicSelect", columnHash: 0xc312c89f )] - public class TopicSelect : IExcelRow + public class TopicSelect : ExcelRow { public struct UnkStruct4Struct { public uint Shop; } - public SeString Name; - public bool Unknown1; - public byte Unknown2; - public ushort Unknown3; - public UnkStruct4Struct[] UnkStruct4; + public SeString Name { get; set; } + public bool Unknown1 { get; set; } + public byte Unknown2 { get; set; } + public ushort Unknown3 { get; set; } + public UnkStruct4Struct[] UnkStruct4 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); Unknown1 = parser.ReadColumn< bool >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/Town.cs b/src/Lumina.Excel/GeneratedSheets/Town.cs index f207a7cc..fd11c932 100644 --- a/src/Lumina.Excel/GeneratedSheets/Town.cs +++ b/src/Lumina.Excel/GeneratedSheets/Town.cs @@ -7,19 +7,15 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Town", columnHash: 0x993d983d )] - public class Town : IExcelRow + public class Town : ExcelRow { - public SeString Name; - public int Icon; + public SeString Name { get; set; } + public int Icon { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); Icon = parser.ReadColumn< int >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/Trait.cs b/src/Lumina.Excel/GeneratedSheets/Trait.cs index 6294913b..5b7612fd 100644 --- a/src/Lumina.Excel/GeneratedSheets/Trait.cs +++ b/src/Lumina.Excel/GeneratedSheets/Trait.cs @@ -7,33 +7,29 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Trait", columnHash: 0x82f2127d )] - public class Trait : IExcelRow + public class Trait : ExcelRow { - public SeString Name; - public int Icon; - public LazyRow< ClassJob > ClassJob; - public byte Level; - public LazyRow< Quest > Quest; - public short Value; - public LazyRow< ClassJobCategory > ClassJobCategory; - public byte Unknown7; + public SeString Name { get; set; } + public int Icon { get; set; } + public LazyRow< ClassJob > ClassJob { get; set; } + public byte Level { get; set; } + public LazyRow< Quest > Quest { get; set; } + public short Value { get; set; } + public LazyRow< ClassJobCategory > ClassJobCategory { get; set; } + public byte Unknown7 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); Icon = parser.ReadColumn< int >( 1 ); - ClassJob = new LazyRow< ClassJob >( lumina, parser.ReadColumn< byte >( 2 ), language ); + ClassJob = new LazyRow< ClassJob >( gameData, parser.ReadColumn< byte >( 2 ), language ); Level = parser.ReadColumn< byte >( 3 ); - Quest = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 4 ), language ); + Quest = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 4 ), language ); Value = parser.ReadColumn< short >( 5 ); - ClassJobCategory = new LazyRow< ClassJobCategory >( lumina, parser.ReadColumn< byte >( 6 ), language ); + ClassJobCategory = new LazyRow< ClassJobCategory >( gameData, parser.ReadColumn< byte >( 6 ), language ); Unknown7 = parser.ReadColumn< byte >( 7 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/TraitRecast.cs b/src/Lumina.Excel/GeneratedSheets/TraitRecast.cs index f1a9415d..3f4accd7 100644 --- a/src/Lumina.Excel/GeneratedSheets/TraitRecast.cs +++ b/src/Lumina.Excel/GeneratedSheets/TraitRecast.cs @@ -7,23 +7,19 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "TraitRecast", columnHash: 0xdc23efe7 )] - public class TraitRecast : IExcelRow + public class TraitRecast : ExcelRow { - public LazyRow< Trait > Trait; - public LazyRow< Action > Action; - public ushort Timeds; + public LazyRow< Trait > Trait { get; set; } + public LazyRow< Action > Action { get; set; } + public ushort Timeds { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Trait = new LazyRow< Trait >( lumina, parser.ReadColumn< ushort >( 0 ), language ); - Action = new LazyRow< Action >( lumina, parser.ReadColumn< ushort >( 1 ), language ); + Trait = new LazyRow< Trait >( gameData, parser.ReadColumn< ushort >( 0 ), language ); + Action = new LazyRow< Action >( gameData, parser.ReadColumn< ushort >( 1 ), language ); Timeds = parser.ReadColumn< ushort >( 2 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/TraitTransient.cs b/src/Lumina.Excel/GeneratedSheets/TraitTransient.cs index 1243a853..d2116335 100644 --- a/src/Lumina.Excel/GeneratedSheets/TraitTransient.cs +++ b/src/Lumina.Excel/GeneratedSheets/TraitTransient.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "TraitTransient", columnHash: 0xdebb20e3 )] - public class TraitTransient : IExcelRow + public class TraitTransient : ExcelRow { - public SeString Description; + public SeString Description { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Description = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/Transformation.cs b/src/Lumina.Excel/GeneratedSheets/Transformation.cs index 376bb872..4010cc94 100644 --- a/src/Lumina.Excel/GeneratedSheets/Transformation.cs +++ b/src/Lumina.Excel/GeneratedSheets/Transformation.cs @@ -7,75 +7,71 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Transformation", columnHash: 0xebf905a5 )] - public class Transformation : IExcelRow + public class Transformation : ExcelRow { - public byte Unknown0; - public LazyRow< ModelChara > Model; - public LazyRow< BNpcName > BNpcName; - public LazyRow< BNpcCustomize > BNpcCustomize; - public LazyRow< NpcEquip > NpcEquip; - public bool ExHotbarEnableConfig; - public LazyRow< Action > Action0; - public bool Unknown7; - public LazyRow< Action > Action1; - public bool Unknown9; - public LazyRow< Action > Action2; - public bool Unknown11; - public LazyRow< Action > Action3; - public bool Unknown13; - public LazyRow< Action > Action4; - public bool Unknown15; - public LazyRow< Action > Action5; - public bool Unknown17; - public LazyRow< RPParameter > RPParameter; - public LazyRow< Action > RemoveAction; - public bool Unknown20; - public bool Unknown21; - public byte Unknown22; - public float Speed; - public float Scale; - public bool IsPvP; - public bool IsEvent; - public bool PlayerCamera; - public bool Unknown28; - public bool Unknown29; - public LazyRow< VFX > StartVFX; - public LazyRow< VFX > EndVFX; - public LazyRow< Action > Action6; - public sbyte Unknown33; - public LazyRow< Action > Action7; - public byte Unknown35; - public bool Unknown54; + public byte Unknown0 { get; set; } + public LazyRow< ModelChara > Model { get; set; } + public LazyRow< BNpcName > BNpcName { get; set; } + public LazyRow< BNpcCustomize > BNpcCustomize { get; set; } + public LazyRow< NpcEquip > NpcEquip { get; set; } + public bool ExHotbarEnableConfig { get; set; } + public LazyRow< Action > Action0 { get; set; } + public bool Unknown7 { get; set; } + public LazyRow< Action > Action1 { get; set; } + public bool Unknown9 { get; set; } + public LazyRow< Action > Action2 { get; set; } + public bool Unknown11 { get; set; } + public LazyRow< Action > Action3 { get; set; } + public bool Unknown13 { get; set; } + public LazyRow< Action > Action4 { get; set; } + public bool Unknown15 { get; set; } + public LazyRow< Action > Action5 { get; set; } + public bool Unknown17 { get; set; } + public LazyRow< RPParameter > RPParameter { get; set; } + public LazyRow< Action > RemoveAction { get; set; } + public bool Unknown20 { get; set; } + public bool Unknown21 { get; set; } + public byte Unknown22 { get; set; } + public float Speed { get; set; } + public float Scale { get; set; } + public bool IsPvP { get; set; } + public bool IsEvent { get; set; } + public bool PlayerCamera { get; set; } + public bool Unknown28 { get; set; } + public bool Unknown29 { get; set; } + public LazyRow< VFX > StartVFX { get; set; } + public LazyRow< VFX > EndVFX { get; set; } + public LazyRow< Action > Action6 { get; set; } + public sbyte Unknown33 { get; set; } + public LazyRow< Action > Action7 { get; set; } + public byte Unknown35 { get; set; } + public bool Unknown54 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< byte >( 0 ); - Model = new LazyRow< ModelChara >( lumina, parser.ReadColumn< short >( 1 ), language ); - BNpcName = new LazyRow< BNpcName >( lumina, parser.ReadColumn< ushort >( 2 ), language ); - BNpcCustomize = new LazyRow< BNpcCustomize >( lumina, parser.ReadColumn< int >( 3 ), language ); - NpcEquip = new LazyRow< NpcEquip >( lumina, parser.ReadColumn< int >( 4 ), language ); + Model = new LazyRow< ModelChara >( gameData, parser.ReadColumn< short >( 1 ), language ); + BNpcName = new LazyRow< BNpcName >( gameData, parser.ReadColumn< ushort >( 2 ), language ); + BNpcCustomize = new LazyRow< BNpcCustomize >( gameData, parser.ReadColumn< int >( 3 ), language ); + NpcEquip = new LazyRow< NpcEquip >( gameData, parser.ReadColumn< int >( 4 ), language ); ExHotbarEnableConfig = parser.ReadColumn< bool >( 5 ); - Action0 = new LazyRow< Action >( lumina, parser.ReadColumn< ushort >( 6 ), language ); + Action0 = new LazyRow< Action >( gameData, parser.ReadColumn< ushort >( 6 ), language ); Unknown7 = parser.ReadColumn< bool >( 7 ); - Action1 = new LazyRow< Action >( lumina, parser.ReadColumn< ushort >( 8 ), language ); + Action1 = new LazyRow< Action >( gameData, parser.ReadColumn< ushort >( 8 ), language ); Unknown9 = parser.ReadColumn< bool >( 9 ); - Action2 = new LazyRow< Action >( lumina, parser.ReadColumn< ushort >( 10 ), language ); + Action2 = new LazyRow< Action >( gameData, parser.ReadColumn< ushort >( 10 ), language ); Unknown11 = parser.ReadColumn< bool >( 11 ); - Action3 = new LazyRow< Action >( lumina, parser.ReadColumn< ushort >( 12 ), language ); + Action3 = new LazyRow< Action >( gameData, parser.ReadColumn< ushort >( 12 ), language ); Unknown13 = parser.ReadColumn< bool >( 13 ); - Action4 = new LazyRow< Action >( lumina, parser.ReadColumn< ushort >( 14 ), language ); + Action4 = new LazyRow< Action >( gameData, parser.ReadColumn< ushort >( 14 ), language ); Unknown15 = parser.ReadColumn< bool >( 15 ); - Action5 = new LazyRow< Action >( lumina, parser.ReadColumn< ushort >( 16 ), language ); + Action5 = new LazyRow< Action >( gameData, parser.ReadColumn< ushort >( 16 ), language ); Unknown17 = parser.ReadColumn< bool >( 17 ); - RPParameter = new LazyRow< RPParameter >( lumina, parser.ReadColumn< ushort >( 18 ), language ); - RemoveAction = new LazyRow< Action >( lumina, parser.ReadColumn< ushort >( 19 ), language ); + RPParameter = new LazyRow< RPParameter >( gameData, parser.ReadColumn< ushort >( 18 ), language ); + RemoveAction = new LazyRow< Action >( gameData, parser.ReadColumn< ushort >( 19 ), language ); Unknown20 = parser.ReadColumn< bool >( 20 ); Unknown21 = parser.ReadColumn< bool >( 21 ); Unknown22 = parser.ReadColumn< byte >( 22 ); @@ -86,11 +82,11 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) PlayerCamera = parser.ReadColumn< bool >( 27 ); Unknown28 = parser.ReadColumn< bool >( 28 ); Unknown29 = parser.ReadColumn< bool >( 29 ); - StartVFX = new LazyRow< VFX >( lumina, parser.ReadColumn< ushort >( 30 ), language ); - EndVFX = new LazyRow< VFX >( lumina, parser.ReadColumn< ushort >( 31 ), language ); - Action6 = new LazyRow< Action >( lumina, parser.ReadColumn< uint >( 32 ), language ); + StartVFX = new LazyRow< VFX >( gameData, parser.ReadColumn< ushort >( 30 ), language ); + EndVFX = new LazyRow< VFX >( gameData, parser.ReadColumn< ushort >( 31 ), language ); + Action6 = new LazyRow< Action >( gameData, parser.ReadColumn< uint >( 32 ), language ); Unknown33 = parser.ReadColumn< sbyte >( 33 ); - Action7 = new LazyRow< Action >( lumina, parser.ReadColumn< ushort >( 34 ), language ); + Action7 = new LazyRow< Action >( gameData, parser.ReadColumn< ushort >( 34 ), language ); Unknown35 = parser.ReadColumn< byte >( 35 ); Unknown54 = parser.ReadColumn< bool >( 36 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/Treasure.cs b/src/Lumina.Excel/GeneratedSheets/Treasure.cs index 5517d75a..1e5168b7 100644 --- a/src/Lumina.Excel/GeneratedSheets/Treasure.cs +++ b/src/Lumina.Excel/GeneratedSheets/Treasure.cs @@ -7,28 +7,24 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Treasure", columnHash: 0x030e840a )] - public class Treasure : IExcelRow + public class Treasure : ExcelRow { - public SeString Unknown0; - public sbyte Unknown1; - public SeString Unknown2; - public sbyte Unknown3; - public sbyte Unknown4; - public sbyte Unknown5; - public sbyte Unknown6; - public sbyte Unknown7; - public LazyRow< Item > Item; - public bool Unknown9; - public bool Unknown10; + public SeString Unknown0 { get; set; } + public sbyte Unknown1 { get; set; } + public SeString Unknown2 { get; set; } + public sbyte Unknown3 { get; set; } + public sbyte Unknown4 { get; set; } + public sbyte Unknown5 { get; set; } + public sbyte Unknown6 { get; set; } + public sbyte Unknown7 { get; set; } + public LazyRow< Item > Item { get; set; } + public bool Unknown9 { get; set; } + public bool Unknown10 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< SeString >( 0 ); Unknown1 = parser.ReadColumn< sbyte >( 1 ); @@ -38,7 +34,7 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) Unknown5 = parser.ReadColumn< sbyte >( 5 ); Unknown6 = parser.ReadColumn< sbyte >( 6 ); Unknown7 = parser.ReadColumn< sbyte >( 7 ); - Item = new LazyRow< Item >( lumina, parser.ReadColumn< uint >( 8 ), language ); + Item = new LazyRow< Item >( gameData, parser.ReadColumn< uint >( 8 ), language ); Unknown9 = parser.ReadColumn< bool >( 9 ); Unknown10 = parser.ReadColumn< bool >( 10 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/TreasureHuntRank.cs b/src/Lumina.Excel/GeneratedSheets/TreasureHuntRank.cs index 565a5f85..23cec264 100644 --- a/src/Lumina.Excel/GeneratedSheets/TreasureHuntRank.cs +++ b/src/Lumina.Excel/GeneratedSheets/TreasureHuntRank.cs @@ -7,32 +7,28 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "TreasureHuntRank", columnHash: 0x3997d502 )] - public class TreasureHuntRank : IExcelRow + public class TreasureHuntRank : ExcelRow { - public byte Unknown0; - public uint Icon; - public LazyRow< Item > ItemName; - public LazyRow< EventItem > KeyItemName; - public LazyRow< EventItem > InstanceMap; - public byte MaxPartySize; - public byte TreasureHuntTexture; - public ushort Unknown7; - public bool Unknown8; + public byte Unknown0 { get; set; } + public uint Icon { get; set; } + public LazyRow< Item > ItemName { get; set; } + public LazyRow< EventItem > KeyItemName { get; set; } + public LazyRow< EventItem > InstanceMap { get; set; } + public byte MaxPartySize { get; set; } + public byte TreasureHuntTexture { get; set; } + public ushort Unknown7 { get; set; } + public bool Unknown8 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< byte >( 0 ); Icon = parser.ReadColumn< uint >( 1 ); - ItemName = new LazyRow< Item >( lumina, parser.ReadColumn< int >( 2 ), language ); - KeyItemName = new LazyRow< EventItem >( lumina, parser.ReadColumn< int >( 3 ), language ); - InstanceMap = new LazyRow< EventItem >( lumina, parser.ReadColumn< int >( 4 ), language ); + ItemName = new LazyRow< Item >( gameData, parser.ReadColumn< int >( 2 ), language ); + KeyItemName = new LazyRow< EventItem >( gameData, parser.ReadColumn< int >( 3 ), language ); + InstanceMap = new LazyRow< EventItem >( gameData, parser.ReadColumn< int >( 4 ), language ); MaxPartySize = parser.ReadColumn< byte >( 5 ); TreasureHuntTexture = parser.ReadColumn< byte >( 6 ); Unknown7 = parser.ReadColumn< ushort >( 7 ); diff --git a/src/Lumina.Excel/GeneratedSheets/TreasureModel.cs b/src/Lumina.Excel/GeneratedSheets/TreasureModel.cs index b0fda79c..30327c0b 100644 --- a/src/Lumina.Excel/GeneratedSheets/TreasureModel.cs +++ b/src/Lumina.Excel/GeneratedSheets/TreasureModel.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "TreasureModel", columnHash: 0xdebb20e3 )] - public class TreasureModel : IExcelRow + public class TreasureModel : ExcelRow { - public SeString Path; + public SeString Path { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Path = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/TreasureSpot.cs b/src/Lumina.Excel/GeneratedSheets/TreasureSpot.cs index ff667208..54c25c80 100644 --- a/src/Lumina.Excel/GeneratedSheets/TreasureSpot.cs +++ b/src/Lumina.Excel/GeneratedSheets/TreasureSpot.cs @@ -7,22 +7,18 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "TreasureSpot", columnHash: 0x4a63eb8e )] - public class TreasureSpot : IExcelRow + public class TreasureSpot : ExcelRow { - public LazyRow< Level > Location; - public float MapOffsetX; - public float MapOffsetY; + public LazyRow< Level > Location { get; set; } + public float MapOffsetX { get; set; } + public float MapOffsetY { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Location = new LazyRow< Level >( lumina, parser.ReadColumn< int >( 0 ), language ); + Location = new LazyRow< Level >( gameData, parser.ReadColumn< int >( 0 ), language ); MapOffsetX = parser.ReadColumn< float >( 1 ); MapOffsetY = parser.ReadColumn< float >( 2 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/Tribe.cs b/src/Lumina.Excel/GeneratedSheets/Tribe.cs index f19dd01f..0ccb56fc 100644 --- a/src/Lumina.Excel/GeneratedSheets/Tribe.cs +++ b/src/Lumina.Excel/GeneratedSheets/Tribe.cs @@ -7,27 +7,23 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Tribe", columnHash: 0xe74759fb )] - public class Tribe : IExcelRow + public class Tribe : ExcelRow { - public SeString Masculine; - public SeString Feminine; - public sbyte Hp; - public sbyte Mp; - public sbyte STR; - public sbyte VIT; - public sbyte DEX; - public sbyte INT; - public sbyte MND; - public sbyte PIE; + public SeString Masculine { get; set; } + public SeString Feminine { get; set; } + public sbyte Hp { get; set; } + public sbyte Mp { get; set; } + public sbyte STR { get; set; } + public sbyte VIT { get; set; } + public sbyte DEX { get; set; } + public sbyte INT { get; set; } + public sbyte MND { get; set; } + public sbyte PIE { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Masculine = parser.ReadColumn< SeString >( 0 ); Feminine = parser.ReadColumn< SeString >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/TripleTriad.cs b/src/Lumina.Excel/GeneratedSheets/TripleTriad.cs index 9ccd7441..e06ea21e 100644 --- a/src/Lumina.Excel/GeneratedSheets/TripleTriad.cs +++ b/src/Lumina.Excel/GeneratedSheets/TripleTriad.cs @@ -7,60 +7,56 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "TripleTriad", columnHash: 0x646dde20 )] - public class TripleTriad : IExcelRow + public class TripleTriad : ExcelRow { - public LazyRow< TripleTriadCard >[] TripleTriadCardFixed; - public LazyRow< TripleTriadCard >[] TripleTriadCardVariable; - public LazyRow< TripleTriadRule >[] TripleTriadRule; - public bool UsesRegionalRules; - public ushort Fee; - public byte PreviousQuestJoin; - public LazyRow< Quest >[] PreviousQuest; - public ushort StartTime; - public ushort EndTime; - public LazyRow< DefaultTalk > DefaultTalkChallenge; - public LazyRow< DefaultTalk > DefaultTalkUnavailable; - public LazyRow< DefaultTalk > DefaultTalkNPCWin; - public LazyRow< DefaultTalk > DefaultTalkDraw; - public LazyRow< DefaultTalk > DefaultTalkPCWin; - public bool Unknown25; - public LazyRow< Item >[] ItemPossibleReward; + public LazyRow< TripleTriadCard >[] TripleTriadCardFixed { get; set; } + public LazyRow< TripleTriadCard >[] TripleTriadCardVariable { get; set; } + public LazyRow< TripleTriadRule >[] TripleTriadRule { get; set; } + public bool UsesRegionalRules { get; set; } + public ushort Fee { get; set; } + public byte PreviousQuestJoin { get; set; } + public LazyRow< Quest >[] PreviousQuest { get; set; } + public ushort StartTime { get; set; } + public ushort EndTime { get; set; } + public LazyRow< DefaultTalk > DefaultTalkChallenge { get; set; } + public LazyRow< DefaultTalk > DefaultTalkUnavailable { get; set; } + public LazyRow< DefaultTalk > DefaultTalkNPCWin { get; set; } + public LazyRow< DefaultTalk > DefaultTalkDraw { get; set; } + public LazyRow< DefaultTalk > DefaultTalkPCWin { get; set; } + public bool Unknown25 { get; set; } + public LazyRow< Item >[] ItemPossibleReward { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); TripleTriadCardFixed = new LazyRow< TripleTriadCard >[ 5 ]; for( var i = 0; i < 5; i++ ) - TripleTriadCardFixed[ i ] = new LazyRow< TripleTriadCard >( lumina, parser.ReadColumn< ushort >( 0 + i ), language ); + TripleTriadCardFixed[ i ] = new LazyRow< TripleTriadCard >( gameData, parser.ReadColumn< ushort >( 0 + i ), language ); TripleTriadCardVariable = new LazyRow< TripleTriadCard >[ 5 ]; for( var i = 0; i < 5; i++ ) - TripleTriadCardVariable[ i ] = new LazyRow< TripleTriadCard >( lumina, parser.ReadColumn< ushort >( 5 + i ), language ); + TripleTriadCardVariable[ i ] = new LazyRow< TripleTriadCard >( gameData, parser.ReadColumn< ushort >( 5 + i ), language ); TripleTriadRule = new LazyRow< TripleTriadRule >[ 2 ]; for( var i = 0; i < 2; i++ ) - TripleTriadRule[ i ] = new LazyRow< TripleTriadRule >( lumina, parser.ReadColumn< byte >( 10 + i ), language ); + TripleTriadRule[ i ] = new LazyRow< TripleTriadRule >( gameData, parser.ReadColumn< byte >( 10 + i ), language ); UsesRegionalRules = parser.ReadColumn< bool >( 12 ); Fee = parser.ReadColumn< ushort >( 13 ); PreviousQuestJoin = parser.ReadColumn< byte >( 14 ); PreviousQuest = new LazyRow< Quest >[ 3 ]; for( var i = 0; i < 3; i++ ) - PreviousQuest[ i ] = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 15 + i ), language ); + PreviousQuest[ i ] = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 15 + i ), language ); StartTime = parser.ReadColumn< ushort >( 18 ); EndTime = parser.ReadColumn< ushort >( 19 ); - DefaultTalkChallenge = new LazyRow< DefaultTalk >( lumina, parser.ReadColumn< uint >( 20 ), language ); - DefaultTalkUnavailable = new LazyRow< DefaultTalk >( lumina, parser.ReadColumn< uint >( 21 ), language ); - DefaultTalkNPCWin = new LazyRow< DefaultTalk >( lumina, parser.ReadColumn< uint >( 22 ), language ); - DefaultTalkDraw = new LazyRow< DefaultTalk >( lumina, parser.ReadColumn< uint >( 23 ), language ); - DefaultTalkPCWin = new LazyRow< DefaultTalk >( lumina, parser.ReadColumn< uint >( 24 ), language ); + DefaultTalkChallenge = new LazyRow< DefaultTalk >( gameData, parser.ReadColumn< uint >( 20 ), language ); + DefaultTalkUnavailable = new LazyRow< DefaultTalk >( gameData, parser.ReadColumn< uint >( 21 ), language ); + DefaultTalkNPCWin = new LazyRow< DefaultTalk >( gameData, parser.ReadColumn< uint >( 22 ), language ); + DefaultTalkDraw = new LazyRow< DefaultTalk >( gameData, parser.ReadColumn< uint >( 23 ), language ); + DefaultTalkPCWin = new LazyRow< DefaultTalk >( gameData, parser.ReadColumn< uint >( 24 ), language ); Unknown25 = parser.ReadColumn< bool >( 25 ); ItemPossibleReward = new LazyRow< Item >[ 4 ]; for( var i = 0; i < 4; i++ ) - ItemPossibleReward[ i ] = new LazyRow< Item >( lumina, parser.ReadColumn< uint >( 26 + i ), language ); + ItemPossibleReward[ i ] = new LazyRow< Item >( gameData, parser.ReadColumn< uint >( 26 + i ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/TripleTriadCard.cs b/src/Lumina.Excel/GeneratedSheets/TripleTriadCard.cs index 40c75a8f..d515d4be 100644 --- a/src/Lumina.Excel/GeneratedSheets/TripleTriadCard.cs +++ b/src/Lumina.Excel/GeneratedSheets/TripleTriadCard.cs @@ -7,26 +7,22 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "TripleTriadCard", columnHash: 0x45c06ae0 )] - public class TripleTriadCard : IExcelRow + public class TripleTriadCard : ExcelRow { - public SeString Name; - public sbyte Unknown1; - public SeString Unknown2; - public sbyte Unknown3; - public sbyte StartsWithVowel; - public sbyte Unknown5; - public sbyte Unknown6; - public sbyte Unknown7; - public SeString Description; + public SeString Name { get; set; } + public sbyte Unknown1 { get; set; } + public SeString Unknown2 { get; set; } + public sbyte Unknown3 { get; set; } + public sbyte StartsWithVowel { get; set; } + public sbyte Unknown5 { get; set; } + public sbyte Unknown6 { get; set; } + public sbyte Unknown7 { get; set; } + public SeString Description { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); Unknown1 = parser.ReadColumn< sbyte >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/TripleTriadCardRarity.cs b/src/Lumina.Excel/GeneratedSheets/TripleTriadCardRarity.cs index 6359b4eb..bba2644c 100644 --- a/src/Lumina.Excel/GeneratedSheets/TripleTriadCardRarity.cs +++ b/src/Lumina.Excel/GeneratedSheets/TripleTriadCardRarity.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "TripleTriadCardRarity", columnHash: 0xdcfd9eba )] - public class TripleTriadCardRarity : IExcelRow + public class TripleTriadCardRarity : ExcelRow { - public byte Stars; + public byte Stars { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Stars = parser.ReadColumn< byte >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/TripleTriadCardResident.cs b/src/Lumina.Excel/GeneratedSheets/TripleTriadCardResident.cs index b338fa77..c9ca11f4 100644 --- a/src/Lumina.Excel/GeneratedSheets/TripleTriadCardResident.cs +++ b/src/Lumina.Excel/GeneratedSheets/TripleTriadCardResident.cs @@ -7,42 +7,46 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "TripleTriadCardResident", columnHash: 0x996e0a5e )] - public class TripleTriadCardResident : IExcelRow + public class TripleTriadCardResident : ExcelRow { - public ushort Unknown0; - public byte Top; - public byte Bottom; - public byte Left; - public byte Right; - public LazyRow< TripleTriadCardRarity > TripleTriadCardRarity; - public LazyRow< TripleTriadCardType > TripleTriadCardType; - public ushort SaleValue; - public byte SortKey; - public ushort[] Unknown54; - public LazyRow< Quest > Quest; + public ushort Unknown0 { get; set; } + public byte Top { get; set; } + public byte Bottom { get; set; } + public byte Left { get; set; } + public byte Right { get; set; } + public LazyRow< TripleTriadCardRarity > TripleTriadCardRarity { get; set; } + public LazyRow< TripleTriadCardType > TripleTriadCardType { get; set; } + public ushort SaleValue { get; set; } + public byte SortKey { get; set; } + public ushort Order { get; set; } + public byte UIPriority { get; set; } + public bool Unknown54 { get; set; } + public byte AcquisitionType { get; set; } + public uint Acquisition { get; set; } + public uint Location { get; set; } + public LazyRow< Quest > Quest { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< ushort >( 0 ); Top = parser.ReadColumn< byte >( 1 ); Bottom = parser.ReadColumn< byte >( 2 ); Left = parser.ReadColumn< byte >( 3 ); Right = parser.ReadColumn< byte >( 4 ); - TripleTriadCardRarity = new LazyRow< TripleTriadCardRarity >( lumina, parser.ReadColumn< byte >( 5 ), language ); - TripleTriadCardType = new LazyRow< TripleTriadCardType >( lumina, parser.ReadColumn< byte >( 6 ), language ); + TripleTriadCardRarity = new LazyRow< TripleTriadCardRarity >( gameData, parser.ReadColumn< byte >( 5 ), language ); + TripleTriadCardType = new LazyRow< TripleTriadCardType >( gameData, parser.ReadColumn< byte >( 6 ), language ); SaleValue = parser.ReadColumn< ushort >( 7 ); SortKey = parser.ReadColumn< byte >( 8 ); - Unknown54 = new ushort[ 6 ]; - for( var i = 0; i < 6; i++ ) - Unknown54[ i ] = parser.ReadColumn< ushort >( 9 + i ); - Quest = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 15 ), language ); + Order = parser.ReadColumn< ushort >( 9 ); + UIPriority = parser.ReadColumn< byte >( 10 ); + Unknown54 = parser.ReadColumn< bool >( 11 ); + AcquisitionType = parser.ReadColumn< byte >( 12 ); + Acquisition = parser.ReadColumn< uint >( 13 ); + Location = parser.ReadColumn< uint >( 14 ); + Quest = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 15 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/TripleTriadCardType.cs b/src/Lumina.Excel/GeneratedSheets/TripleTriadCardType.cs index e8ed6b32..0a567c45 100644 --- a/src/Lumina.Excel/GeneratedSheets/TripleTriadCardType.cs +++ b/src/Lumina.Excel/GeneratedSheets/TripleTriadCardType.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "TripleTriadCardType", columnHash: 0xdebb20e3 )] - public class TripleTriadCardType : IExcelRow + public class TripleTriadCardType : ExcelRow { - public SeString Name; + public SeString Name { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/TripleTriadCompetition.cs b/src/Lumina.Excel/GeneratedSheets/TripleTriadCompetition.cs index 1ea9285e..9a4d1d14 100644 --- a/src/Lumina.Excel/GeneratedSheets/TripleTriadCompetition.cs +++ b/src/Lumina.Excel/GeneratedSheets/TripleTriadCompetition.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "TripleTriadCompetition", columnHash: 0xdebb20e3 )] - public class TripleTriadCompetition : IExcelRow + public class TripleTriadCompetition : ExcelRow { - public SeString Name; + public SeString Name { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/TripleTriadRule.cs b/src/Lumina.Excel/GeneratedSheets/TripleTriadRule.cs index d5ce3b12..9a2b9e8f 100644 --- a/src/Lumina.Excel/GeneratedSheets/TripleTriadRule.cs +++ b/src/Lumina.Excel/GeneratedSheets/TripleTriadRule.cs @@ -7,27 +7,23 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "TripleTriadRule", columnHash: 0x83e50db1 )] - public class TripleTriadRule : IExcelRow + public class TripleTriadRule : ExcelRow { - public SeString Name; - public SeString Unknown1; - public byte Unknown2; - public byte Unknown3; - public bool Unknown54; - public byte Unknown5; - public int Unknown6; + public SeString Name { get; set; } + public SeString Description { get; set; } + public byte Unknown2 { get; set; } + public byte Unknown3 { get; set; } + public bool Unknown54 { get; set; } + public byte Unknown5 { get; set; } + public int Unknown6 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); - Unknown1 = parser.ReadColumn< SeString >( 1 ); + Description = parser.ReadColumn< SeString >( 1 ); Unknown2 = parser.ReadColumn< byte >( 2 ); Unknown3 = parser.ReadColumn< byte >( 3 ); Unknown54 = parser.ReadColumn< bool >( 4 ); diff --git a/src/Lumina.Excel/GeneratedSheets/Tutorial.cs b/src/Lumina.Excel/GeneratedSheets/Tutorial.cs index 92f77806..fc1c2b5d 100644 --- a/src/Lumina.Excel/GeneratedSheets/Tutorial.cs +++ b/src/Lumina.Excel/GeneratedSheets/Tutorial.cs @@ -7,27 +7,23 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Tutorial", columnHash: 0x871b8a1c )] - public class Tutorial : IExcelRow + public class Tutorial : ExcelRow { - public byte Unknown0; - public byte Unknown1; - public byte Unknown2; - public byte Unknown3; - public uint Exp; - public uint Gil; - public LazyRow< Item > RewardTank; - public LazyRow< Item > RewardMelee; - public LazyRow< Item > RewardRanged; - public LazyRow< InstanceContentTextData > Objective; + public byte Unknown0 { get; set; } + public byte Unknown1 { get; set; } + public byte Unknown2 { get; set; } + public byte Unknown3 { get; set; } + public uint Exp { get; set; } + public uint Gil { get; set; } + public LazyRow< Item > RewardTank { get; set; } + public LazyRow< Item > RewardMelee { get; set; } + public LazyRow< Item > RewardRanged { get; set; } + public LazyRow< InstanceContentTextData > Objective { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< byte >( 0 ); Unknown1 = parser.ReadColumn< byte >( 1 ); @@ -35,10 +31,10 @@ public void PopulateData( RowParser parser, Lumina lumina, Language language ) Unknown3 = parser.ReadColumn< byte >( 3 ); Exp = parser.ReadColumn< uint >( 4 ); Gil = parser.ReadColumn< uint >( 5 ); - RewardTank = new LazyRow< Item >( lumina, parser.ReadColumn< uint >( 6 ), language ); - RewardMelee = new LazyRow< Item >( lumina, parser.ReadColumn< uint >( 7 ), language ); - RewardRanged = new LazyRow< Item >( lumina, parser.ReadColumn< uint >( 8 ), language ); - Objective = new LazyRow< InstanceContentTextData >( lumina, parser.ReadColumn< uint >( 9 ), language ); + RewardTank = new LazyRow< Item >( gameData, parser.ReadColumn< uint >( 6 ), language ); + RewardMelee = new LazyRow< Item >( gameData, parser.ReadColumn< uint >( 7 ), language ); + RewardRanged = new LazyRow< Item >( gameData, parser.ReadColumn< uint >( 8 ), language ); + Objective = new LazyRow< InstanceContentTextData >( gameData, parser.ReadColumn< uint >( 9 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/TutorialDPS.cs b/src/Lumina.Excel/GeneratedSheets/TutorialDPS.cs index 07f28511..dc13b370 100644 --- a/src/Lumina.Excel/GeneratedSheets/TutorialDPS.cs +++ b/src/Lumina.Excel/GeneratedSheets/TutorialDPS.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "TutorialDPS", columnHash: 0xdcfd9eba )] - public class TutorialDPS : IExcelRow + public class TutorialDPS : ExcelRow { - public LazyRow< Tutorial > Objective; + public LazyRow< Tutorial > Objective { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Objective = new LazyRow< Tutorial >( lumina, parser.ReadColumn< byte >( 0 ), language ); + Objective = new LazyRow< Tutorial >( gameData, parser.ReadColumn< byte >( 0 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/TutorialHealer.cs b/src/Lumina.Excel/GeneratedSheets/TutorialHealer.cs index 72e2143f..93b25542 100644 --- a/src/Lumina.Excel/GeneratedSheets/TutorialHealer.cs +++ b/src/Lumina.Excel/GeneratedSheets/TutorialHealer.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "TutorialHealer", columnHash: 0xdcfd9eba )] - public class TutorialHealer : IExcelRow + public class TutorialHealer : ExcelRow { - public LazyRow< Tutorial > Objective; + public LazyRow< Tutorial > Objective { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Objective = new LazyRow< Tutorial >( lumina, parser.ReadColumn< byte >( 0 ), language ); + Objective = new LazyRow< Tutorial >( gameData, parser.ReadColumn< byte >( 0 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/TutorialTank.cs b/src/Lumina.Excel/GeneratedSheets/TutorialTank.cs index d856f00a..7b2fbca5 100644 --- a/src/Lumina.Excel/GeneratedSheets/TutorialTank.cs +++ b/src/Lumina.Excel/GeneratedSheets/TutorialTank.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "TutorialTank", columnHash: 0xdcfd9eba )] - public class TutorialTank : IExcelRow + public class TutorialTank : ExcelRow { - public LazyRow< Tutorial > Objective; + public LazyRow< Tutorial > Objective { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Objective = new LazyRow< Tutorial >( lumina, parser.ReadColumn< byte >( 0 ), language ); + Objective = new LazyRow< Tutorial >( gameData, parser.ReadColumn< byte >( 0 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/UIColor.cs b/src/Lumina.Excel/GeneratedSheets/UIColor.cs index 84a17312..757d144e 100644 --- a/src/Lumina.Excel/GeneratedSheets/UIColor.cs +++ b/src/Lumina.Excel/GeneratedSheets/UIColor.cs @@ -7,21 +7,17 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "UIColor", columnHash: 0x05bcd0de )] - public class UIColor : IExcelRow + public class UIColor : ExcelRow { - public uint UIForeground; - public uint UIGlow; - public uint Unknown2; - public uint Unknown3; + public uint UIForeground { get; set; } + public uint UIGlow { get; set; } + public uint Unknown2 { get; set; } + public uint Unknown3 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); UIForeground = parser.ReadColumn< uint >( 0 ); UIGlow = parser.ReadColumn< uint >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/VFX.cs b/src/Lumina.Excel/GeneratedSheets/VFX.cs index 011ed6d6..4c272f3a 100644 --- a/src/Lumina.Excel/GeneratedSheets/VFX.cs +++ b/src/Lumina.Excel/GeneratedSheets/VFX.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "VFX", columnHash: 0xdebb20e3 )] - public class VFX : IExcelRow + public class VFX : ExcelRow { - public SeString Location; + public SeString Location { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Location = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/VaseFlower.cs b/src/Lumina.Excel/GeneratedSheets/VaseFlower.cs index cd176b68..8f32f2bb 100644 --- a/src/Lumina.Excel/GeneratedSheets/VaseFlower.cs +++ b/src/Lumina.Excel/GeneratedSheets/VaseFlower.cs @@ -7,26 +7,22 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "VaseFlower", columnHash: 0x8c05af34 )] - public class VaseFlower : IExcelRow + public class VaseFlower : ExcelRow { - public ushort Unknown0; - public byte Unknown1; - public byte Unknown2; - public LazyRow< Item > Item; + public ushort Unknown0 { get; set; } + public byte Unknown1 { get; set; } + public byte Unknown2 { get; set; } + public LazyRow< Item > Item { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< ushort >( 0 ); Unknown1 = parser.ReadColumn< byte >( 1 ); Unknown2 = parser.ReadColumn< byte >( 2 ); - Item = new LazyRow< Item >( lumina, parser.ReadColumn< uint >( 3 ), language ); + Item = new LazyRow< Item >( gameData, parser.ReadColumn< uint >( 3 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/Warp.cs b/src/Lumina.Excel/GeneratedSheets/Warp.cs index e7cd6fab..cfd5644d 100644 --- a/src/Lumina.Excel/GeneratedSheets/Warp.cs +++ b/src/Lumina.Excel/GeneratedSheets/Warp.cs @@ -7,39 +7,35 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Warp", columnHash: 0x1a234b7b )] - public class Warp : IExcelRow + public class Warp : ExcelRow { - public LazyRow< Level > PopRange; - public LazyRow< TerritoryType > TerritoryType; - public LazyRow< DefaultTalk > ConditionSuccessEvent; - public LazyRow< DefaultTalk > ConditionFailEvent; - public LazyRow< DefaultTalk > ConfirmEvent; - public LazyRow< WarpCondition > WarpCondition; - public LazyRow< WarpLogic > WarpLogic; - public LazyRow< Cutscene > StartCutscene; - public LazyRow< Cutscene > EndCutscene; - public bool CanSkipCutscene; - public SeString Name; - public SeString Question; + public LazyRow< Level > PopRange { get; set; } + public LazyRow< TerritoryType > TerritoryType { get; set; } + public LazyRow< DefaultTalk > ConditionSuccessEvent { get; set; } + public LazyRow< DefaultTalk > ConditionFailEvent { get; set; } + public LazyRow< DefaultTalk > ConfirmEvent { get; set; } + public LazyRow< WarpCondition > WarpCondition { get; set; } + public LazyRow< WarpLogic > WarpLogic { get; set; } + public LazyRow< Cutscene > StartCutscene { get; set; } + public LazyRow< Cutscene > EndCutscene { get; set; } + public bool CanSkipCutscene { get; set; } + public SeString Name { get; set; } + public SeString Question { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - PopRange = new LazyRow< Level >( lumina, parser.ReadColumn< uint >( 0 ), language ); - TerritoryType = new LazyRow< TerritoryType >( lumina, parser.ReadColumn< ushort >( 1 ), language ); - ConditionSuccessEvent = new LazyRow< DefaultTalk >( lumina, parser.ReadColumn< uint >( 2 ), language ); - ConditionFailEvent = new LazyRow< DefaultTalk >( lumina, parser.ReadColumn< uint >( 3 ), language ); - ConfirmEvent = new LazyRow< DefaultTalk >( lumina, parser.ReadColumn< uint >( 4 ), language ); - WarpCondition = new LazyRow< WarpCondition >( lumina, parser.ReadColumn< ushort >( 5 ), language ); - WarpLogic = new LazyRow< WarpLogic >( lumina, parser.ReadColumn< ushort >( 6 ), language ); - StartCutscene = new LazyRow< Cutscene >( lumina, parser.ReadColumn< ushort >( 7 ), language ); - EndCutscene = new LazyRow< Cutscene >( lumina, parser.ReadColumn< ushort >( 8 ), language ); + PopRange = new LazyRow< Level >( gameData, parser.ReadColumn< uint >( 0 ), language ); + TerritoryType = new LazyRow< TerritoryType >( gameData, parser.ReadColumn< ushort >( 1 ), language ); + ConditionSuccessEvent = new LazyRow< DefaultTalk >( gameData, parser.ReadColumn< uint >( 2 ), language ); + ConditionFailEvent = new LazyRow< DefaultTalk >( gameData, parser.ReadColumn< uint >( 3 ), language ); + ConfirmEvent = new LazyRow< DefaultTalk >( gameData, parser.ReadColumn< uint >( 4 ), language ); + WarpCondition = new LazyRow< WarpCondition >( gameData, parser.ReadColumn< ushort >( 5 ), language ); + WarpLogic = new LazyRow< WarpLogic >( gameData, parser.ReadColumn< ushort >( 6 ), language ); + StartCutscene = new LazyRow< Cutscene >( gameData, parser.ReadColumn< ushort >( 7 ), language ); + EndCutscene = new LazyRow< Cutscene >( gameData, parser.ReadColumn< ushort >( 8 ), language ); CanSkipCutscene = parser.ReadColumn< bool >( 9 ); Name = parser.ReadColumn< SeString >( 10 ); Question = parser.ReadColumn< SeString >( 11 ); diff --git a/src/Lumina.Excel/GeneratedSheets/WarpCondition.cs b/src/Lumina.Excel/GeneratedSheets/WarpCondition.cs index 48ed1544..2fd0d94e 100644 --- a/src/Lumina.Excel/GeneratedSheets/WarpCondition.cs +++ b/src/Lumina.Excel/GeneratedSheets/WarpCondition.cs @@ -7,32 +7,28 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "WarpCondition", columnHash: 0xc096f9d0 )] - public class WarpCondition : IExcelRow + public class WarpCondition : ExcelRow { - public ushort Gil; - public byte CompleteParam; - public LazyRow< Quest > RequiredQuest1; - public LazyRow< Quest > RequiredQuest2; - public LazyRow< Quest > DRequiredQuest3; - public LazyRow< Quest > RequiredQuest4; - public ushort QuestReward; - public ushort ClassLevel; + public ushort Gil { get; set; } + public byte CompleteParam { get; set; } + public LazyRow< Quest > RequiredQuest1 { get; set; } + public LazyRow< Quest > RequiredQuest2 { get; set; } + public LazyRow< Quest > DRequiredQuest3 { get; set; } + public LazyRow< Quest > RequiredQuest4 { get; set; } + public ushort QuestReward { get; set; } + public ushort ClassLevel { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Gil = parser.ReadColumn< ushort >( 0 ); CompleteParam = parser.ReadColumn< byte >( 1 ); - RequiredQuest1 = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 2 ), language ); - RequiredQuest2 = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 3 ), language ); - DRequiredQuest3 = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 4 ), language ); - RequiredQuest4 = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 5 ), language ); + RequiredQuest1 = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 2 ), language ); + RequiredQuest2 = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 3 ), language ); + DRequiredQuest3 = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 4 ), language ); + RequiredQuest4 = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 5 ), language ); QuestReward = parser.ReadColumn< ushort >( 6 ); ClassLevel = parser.ReadColumn< ushort >( 7 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/WarpLogic.cs b/src/Lumina.Excel/GeneratedSheets/WarpLogic.cs index b96a7eaf..16c6bd51 100644 --- a/src/Lumina.Excel/GeneratedSheets/WarpLogic.cs +++ b/src/Lumina.Excel/GeneratedSheets/WarpLogic.cs @@ -7,29 +7,25 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "WarpLogic", columnHash: 0x78e83215 )] - public class WarpLogic : IExcelRow + public class WarpLogic : ExcelRow { public struct UnkStruct13Struct { public uint Argument; } - public uint Unknown0; - public SeString WarpName; - public bool CanSkipCutscene; - public SeString[] Function; - public UnkStruct13Struct[] UnkStruct13; - public SeString Question; - public SeString ResponseYes; - public SeString ResponseNo; + public uint Unknown0 { get; set; } + public SeString WarpName { get; set; } + public bool CanSkipCutscene { get; set; } + public SeString[] Function { get; set; } + public UnkStruct13Struct[] UnkStruct13 { get; set; } + public SeString Question { get; set; } + public SeString ResponseYes { get; set; } + public SeString ResponseNo { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< uint >( 0 ); WarpName = parser.ReadColumn< SeString >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/WeaponTimeline.cs b/src/Lumina.Excel/GeneratedSheets/WeaponTimeline.cs index 36219dd4..54ee9951 100644 --- a/src/Lumina.Excel/GeneratedSheets/WeaponTimeline.cs +++ b/src/Lumina.Excel/GeneratedSheets/WeaponTimeline.cs @@ -7,19 +7,15 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "WeaponTimeline", columnHash: 0x9ab94c53 )] - public class WeaponTimeline : IExcelRow + public class WeaponTimeline : ExcelRow { - public SeString File; - public short NextWeaponTimeline; + public SeString File { get; set; } + public short NextWeaponTimeline { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); File = parser.ReadColumn< SeString >( 0 ); NextWeaponTimeline = parser.ReadColumn< short >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/Weather.cs b/src/Lumina.Excel/GeneratedSheets/Weather.cs index 8942f785..aa92f6a7 100644 --- a/src/Lumina.Excel/GeneratedSheets/Weather.cs +++ b/src/Lumina.Excel/GeneratedSheets/Weather.cs @@ -7,24 +7,20 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "Weather", columnHash: 0x02cf2541 )] - public class Weather : IExcelRow + public class Weather : ExcelRow { - public int Icon; - public SeString Name; - public SeString Description; - public SeString Unknown3; - public SeString Unknown4; - public SeString Unknown5; - public SeString Unknown6; + public int Icon { get; set; } + public SeString Name { get; set; } + public SeString Description { get; set; } + public SeString Unknown3 { get; set; } + public SeString Unknown4 { get; set; } + public SeString Unknown5 { get; set; } + public SeString Unknown6 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Icon = parser.ReadColumn< int >( 0 ); Name = parser.ReadColumn< SeString >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/WeatherGroup.cs b/src/Lumina.Excel/GeneratedSheets/WeatherGroup.cs index dc2a61ac..8ca3050f 100644 --- a/src/Lumina.Excel/GeneratedSheets/WeatherGroup.cs +++ b/src/Lumina.Excel/GeneratedSheets/WeatherGroup.cs @@ -7,22 +7,18 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "WeatherGroup", columnHash: 0xfaedad07 )] - public class WeatherGroup : IExcelRow + public class WeatherGroup : ExcelRow { - public int Unknown0; - public LazyRow< WeatherRate > WeatherRate; + public int Unknown0 { get; set; } + public LazyRow< WeatherRate > WeatherRate { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< int >( 0 ); - WeatherRate = new LazyRow< WeatherRate >( lumina, parser.ReadColumn< int >( 1 ), language ); + WeatherRate = new LazyRow< WeatherRate >( gameData, parser.ReadColumn< int >( 1 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/WeatherRate.cs b/src/Lumina.Excel/GeneratedSheets/WeatherRate.cs index 2842fe3f..09691968 100644 --- a/src/Lumina.Excel/GeneratedSheets/WeatherRate.cs +++ b/src/Lumina.Excel/GeneratedSheets/WeatherRate.cs @@ -7,7 +7,7 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "WeatherRate", columnHash: 0x474abce2 )] - public class WeatherRate : IExcelRow + public class WeatherRate : ExcelRow { public struct UnkStruct0Struct { @@ -15,15 +15,11 @@ public struct UnkStruct0Struct public byte Rate; } - public UnkStruct0Struct[] UnkStruct0; + public UnkStruct0Struct[] UnkStruct0 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); UnkStruct0 = new UnkStruct0Struct[ 8 ]; for( var i = 0; i < 8; i++ ) diff --git a/src/Lumina.Excel/GeneratedSheets/WeatherReportReplace.cs b/src/Lumina.Excel/GeneratedSheets/WeatherReportReplace.cs index 0eccf436..4aef20d3 100644 --- a/src/Lumina.Excel/GeneratedSheets/WeatherReportReplace.cs +++ b/src/Lumina.Excel/GeneratedSheets/WeatherReportReplace.cs @@ -7,22 +7,18 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "WeatherReportReplace", columnHash: 0x2020acf6 )] - public class WeatherReportReplace : IExcelRow + public class WeatherReportReplace : ExcelRow { - public LazyRow< PlaceName > PlaceNameSub; - public LazyRow< PlaceName > PlaceNameParent; + public LazyRow< PlaceName > PlaceNameSub { get; set; } + public LazyRow< PlaceName > PlaceNameParent { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - PlaceNameSub = new LazyRow< PlaceName >( lumina, parser.ReadColumn< ushort >( 0 ), language ); - PlaceNameParent = new LazyRow< PlaceName >( lumina, parser.ReadColumn< ushort >( 1 ), language ); + PlaceNameSub = new LazyRow< PlaceName >( gameData, parser.ReadColumn< ushort >( 0 ), language ); + PlaceNameParent = new LazyRow< PlaceName >( gameData, parser.ReadColumn< ushort >( 1 ), language ); } } } \ No newline at end of file diff --git a/src/Lumina.Excel/GeneratedSheets/WebGuidance.cs b/src/Lumina.Excel/GeneratedSheets/WebGuidance.cs index 44f3cf3a..e4256f0d 100644 --- a/src/Lumina.Excel/GeneratedSheets/WebGuidance.cs +++ b/src/Lumina.Excel/GeneratedSheets/WebGuidance.cs @@ -7,25 +7,21 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "WebGuidance", columnHash: 0xa6cfe561 )] - public class WebGuidance : IExcelRow + public class WebGuidance : ExcelRow { - public int Image; - public LazyRow< WebURL > Url; - public SeString Name; - public SeString Unknown54; - public SeString Description; + public int Image { get; set; } + public LazyRow< WebURL > Url { get; set; } + public SeString Name { get; set; } + public SeString Unknown54 { get; set; } + public SeString Description { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Image = parser.ReadColumn< int >( 0 ); - Url = new LazyRow< WebURL >( lumina, parser.ReadColumn< byte >( 1 ), language ); + Url = new LazyRow< WebURL >( gameData, parser.ReadColumn< byte >( 1 ), language ); Name = parser.ReadColumn< SeString >( 2 ); Unknown54 = parser.ReadColumn< SeString >( 3 ); Description = parser.ReadColumn< SeString >( 4 ); diff --git a/src/Lumina.Excel/GeneratedSheets/WebURL.cs b/src/Lumina.Excel/GeneratedSheets/WebURL.cs index ac92c5d6..d2ece8b8 100644 --- a/src/Lumina.Excel/GeneratedSheets/WebURL.cs +++ b/src/Lumina.Excel/GeneratedSheets/WebURL.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "WebURL", columnHash: 0xdebb20e3 )] - public class WebURL : IExcelRow + public class WebURL : ExcelRow { - public SeString URL; + public SeString URL { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); URL = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/WeddingBGM.cs b/src/Lumina.Excel/GeneratedSheets/WeddingBGM.cs index 6863d641..d7f6c63c 100644 --- a/src/Lumina.Excel/GeneratedSheets/WeddingBGM.cs +++ b/src/Lumina.Excel/GeneratedSheets/WeddingBGM.cs @@ -7,21 +7,17 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "WeddingBGM", columnHash: 0x3d65a9f1 )] - public class WeddingBGM : IExcelRow + public class WeddingBGM : ExcelRow { - public LazyRow< BGM > Song; - public SeString SongName; + public LazyRow< BGM > Song { get; set; } + public SeString SongName { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Song = new LazyRow< BGM >( lumina, parser.ReadColumn< ushort >( 0 ), language ); + Song = new LazyRow< BGM >( gameData, parser.ReadColumn< ushort >( 0 ), language ); SongName = parser.ReadColumn< SeString >( 1 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/WeeklyBingoOrderData.cs b/src/Lumina.Excel/GeneratedSheets/WeeklyBingoOrderData.cs index 8dab5075..9d2a6996 100644 --- a/src/Lumina.Excel/GeneratedSheets/WeeklyBingoOrderData.cs +++ b/src/Lumina.Excel/GeneratedSheets/WeeklyBingoOrderData.cs @@ -7,28 +7,24 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "WeeklyBingoOrderData", columnHash: 0xe0f2b530 )] - public class WeeklyBingoOrderData : IExcelRow + public class WeeklyBingoOrderData : ExcelRow { - public uint Type; - public uint Data; - public byte Unknown2; - public LazyRow< WeeklyBingoText > Text; - public uint Icon; - public byte Unknown5; + public uint Type { get; set; } + public uint Data { get; set; } + public byte Unknown2 { get; set; } + public LazyRow< WeeklyBingoText > Text { get; set; } + public uint Icon { get; set; } + public byte Unknown5 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Type = parser.ReadColumn< uint >( 0 ); Data = parser.ReadColumn< uint >( 1 ); Unknown2 = parser.ReadColumn< byte >( 2 ); - Text = new LazyRow< WeeklyBingoText >( lumina, parser.ReadColumn< byte >( 3 ), language ); + Text = new LazyRow< WeeklyBingoText >( gameData, parser.ReadColumn< byte >( 3 ), language ); Icon = parser.ReadColumn< uint >( 4 ); Unknown5 = parser.ReadColumn< byte >( 5 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/WeeklyBingoRewardData.cs b/src/Lumina.Excel/GeneratedSheets/WeeklyBingoRewardData.cs index c06c8106..df78f729 100644 --- a/src/Lumina.Excel/GeneratedSheets/WeeklyBingoRewardData.cs +++ b/src/Lumina.Excel/GeneratedSheets/WeeklyBingoRewardData.cs @@ -7,7 +7,7 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "WeeklyBingoRewardData", columnHash: 0x02b099a0 )] - public class WeeklyBingoRewardData : IExcelRow + public class WeeklyBingoRewardData : ExcelRow { public struct UnkStruct0Struct { @@ -18,18 +18,14 @@ public struct UnkStruct0Struct public byte RewardOption; } - public UnkStruct0Struct[] UnkStruct0; - public uint RewardItem2; - public bool RewardHQ2; - public ushort RewardQuantity2; + public UnkStruct0Struct[] UnkStruct0 { get; set; } + public uint RewardItem2 { get; set; } + public bool RewardHQ2 { get; set; } + public ushort RewardQuantity2 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); UnkStruct0 = new UnkStruct0Struct[ 2 ]; for( var i = 0; i < 2; i++ ) diff --git a/src/Lumina.Excel/GeneratedSheets/WeeklyBingoText.cs b/src/Lumina.Excel/GeneratedSheets/WeeklyBingoText.cs index 657c8588..93e6ca52 100644 --- a/src/Lumina.Excel/GeneratedSheets/WeeklyBingoText.cs +++ b/src/Lumina.Excel/GeneratedSheets/WeeklyBingoText.cs @@ -7,18 +7,14 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "WeeklyBingoText", columnHash: 0xdebb20e3 )] - public class WeeklyBingoText : IExcelRow + public class WeeklyBingoText : ExcelRow { - public SeString Description; + public SeString Description { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Description = parser.ReadColumn< SeString >( 0 ); } diff --git a/src/Lumina.Excel/GeneratedSheets/WeeklyLotBonus.cs b/src/Lumina.Excel/GeneratedSheets/WeeklyLotBonus.cs index 85447a9b..69c30d0b 100644 --- a/src/Lumina.Excel/GeneratedSheets/WeeklyLotBonus.cs +++ b/src/Lumina.Excel/GeneratedSheets/WeeklyLotBonus.cs @@ -7,83 +7,79 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "WeeklyLotBonus", columnHash: 0x69ba3687 )] - public class WeeklyLotBonus : IExcelRow + public class WeeklyLotBonus : ExcelRow { - public byte[] WeeklyLotBonusThreshold; - public byte Unknown31; - public ushort Unknown32; - public ushort Unknown33; - public ushort Unknown34; - public ushort Unknown35; - public ushort Unknown36; - public ushort Unknown37; - public ushort Unknown38; - public ushort Unknown39; - public ushort Unknown40; - public ushort Unknown41; - public ushort Unknown42; - public ushort Unknown43; - public ushort Unknown44; - public ushort Unknown45; - public ushort Unknown46; - public ushort Unknown47; - public ushort Unknown48; - public ushort Unknown49; - public ushort Unknown50; - public ushort Unknown51; - public ushort Unknown52; - public ushort Unknown53; - public ushort Unknown54; - public ushort Unknown55; - public ushort Unknown56; - public ushort Unknown57; - public ushort Unknown58; - public ushort Unknown59; - public ushort Unknown60; - public ushort Unknown61; - public ushort Unknown62; - public ushort Unknown63; - public byte Unknown64; - public byte Unknown65; - public byte Unknown66; - public byte Unknown67; - public byte Unknown68; - public byte Unknown69; - public byte Unknown70; - public byte Unknown71; - public byte Unknown72; - public byte Unknown73; - public byte Unknown74; - public byte Unknown75; - public byte Unknown76; - public byte Unknown77; - public byte Unknown78; - public byte Unknown79; - public byte Unknown80; - public byte Unknown81; - public byte Unknown82; - public byte Unknown83; - public byte Unknown84; - public byte Unknown85; - public byte Unknown86; - public byte Unknown87; - public byte Unknown88; - public byte Unknown89; - public byte Unknown90; - public byte Unknown91; - public byte Unknown92; - public byte Unknown93; - public byte Unknown94; - public byte Unknown95; + public byte[] WeeklyLotBonusThreshold { get; set; } + public byte Unknown31 { get; set; } + public ushort Unknown32 { get; set; } + public ushort Unknown33 { get; set; } + public ushort Unknown34 { get; set; } + public ushort Unknown35 { get; set; } + public ushort Unknown36 { get; set; } + public ushort Unknown37 { get; set; } + public ushort Unknown38 { get; set; } + public ushort Unknown39 { get; set; } + public ushort Unknown40 { get; set; } + public ushort Unknown41 { get; set; } + public ushort Unknown42 { get; set; } + public ushort Unknown43 { get; set; } + public ushort Unknown44 { get; set; } + public ushort Unknown45 { get; set; } + public ushort Unknown46 { get; set; } + public ushort Unknown47 { get; set; } + public ushort Unknown48 { get; set; } + public ushort Unknown49 { get; set; } + public ushort Unknown50 { get; set; } + public ushort Unknown51 { get; set; } + public ushort Unknown52 { get; set; } + public ushort Unknown53 { get; set; } + public ushort Unknown54 { get; set; } + public ushort Unknown55 { get; set; } + public ushort Unknown56 { get; set; } + public ushort Unknown57 { get; set; } + public ushort Unknown58 { get; set; } + public ushort Unknown59 { get; set; } + public ushort Unknown60 { get; set; } + public ushort Unknown61 { get; set; } + public ushort Unknown62 { get; set; } + public ushort Unknown63 { get; set; } + public byte Unknown64 { get; set; } + public byte Unknown65 { get; set; } + public byte Unknown66 { get; set; } + public byte Unknown67 { get; set; } + public byte Unknown68 { get; set; } + public byte Unknown69 { get; set; } + public byte Unknown70 { get; set; } + public byte Unknown71 { get; set; } + public byte Unknown72 { get; set; } + public byte Unknown73 { get; set; } + public byte Unknown74 { get; set; } + public byte Unknown75 { get; set; } + public byte Unknown76 { get; set; } + public byte Unknown77 { get; set; } + public byte Unknown78 { get; set; } + public byte Unknown79 { get; set; } + public byte Unknown80 { get; set; } + public byte Unknown81 { get; set; } + public byte Unknown82 { get; set; } + public byte Unknown83 { get; set; } + public byte Unknown84 { get; set; } + public byte Unknown85 { get; set; } + public byte Unknown86 { get; set; } + public byte Unknown87 { get; set; } + public byte Unknown88 { get; set; } + public byte Unknown89 { get; set; } + public byte Unknown90 { get; set; } + public byte Unknown91 { get; set; } + public byte Unknown92 { get; set; } + public byte Unknown93 { get; set; } + public byte Unknown94 { get; set; } + public byte Unknown95 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); WeeklyLotBonusThreshold = new byte[ 31 ]; for( var i = 0; i < 31; i++ ) diff --git a/src/Lumina.Excel/GeneratedSheets/World.cs b/src/Lumina.Excel/GeneratedSheets/World.cs index b9075a0b..5261d8e1 100644 --- a/src/Lumina.Excel/GeneratedSheets/World.cs +++ b/src/Lumina.Excel/GeneratedSheets/World.cs @@ -7,25 +7,21 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "World", columnHash: 0xd4d62b80 )] - public class World : IExcelRow + public class World : ExcelRow { - public SeString Name; - public byte UserType; - public LazyRow< WorldDCGroupType > DataCenter; - public bool IsPublic; + public SeString Name { get; set; } + public byte UserType { get; set; } + public LazyRow< WorldDCGroupType > DataCenter { get; set; } + public bool IsPublic { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); UserType = parser.ReadColumn< byte >( 1 ); - DataCenter = new LazyRow< WorldDCGroupType >( lumina, parser.ReadColumn< byte >( 2 ), language ); + DataCenter = new LazyRow< WorldDCGroupType >( gameData, parser.ReadColumn< byte >( 2 ), language ); IsPublic = parser.ReadColumn< bool >( 3 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/WorldDCGroupType.cs b/src/Lumina.Excel/GeneratedSheets/WorldDCGroupType.cs index 10d614cc..98b4bdcb 100644 --- a/src/Lumina.Excel/GeneratedSheets/WorldDCGroupType.cs +++ b/src/Lumina.Excel/GeneratedSheets/WorldDCGroupType.cs @@ -7,19 +7,15 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "WorldDCGroupType", columnHash: 0x9ff65ad6 )] - public class WorldDCGroupType : IExcelRow + public class WorldDCGroupType : ExcelRow { - public SeString Name; - public byte Region; + public SeString Name { get; set; } + public byte Region { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Name = parser.ReadColumn< SeString >( 0 ); Region = parser.ReadColumn< byte >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/YKW.cs b/src/Lumina.Excel/GeneratedSheets/YKW.cs index e194a00c..9d7f4a80 100644 --- a/src/Lumina.Excel/GeneratedSheets/YKW.cs +++ b/src/Lumina.Excel/GeneratedSheets/YKW.cs @@ -7,27 +7,23 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "YKW", columnHash: 0x12e24636 )] - public class YKW : IExcelRow + public class YKW : ExcelRow { - public ushort Unknown0; - public LazyRow< Item > Item; - public LazyRow< TerritoryType >[] Location; - public SeString Unknown8; + public ushort Unknown0 { get; set; } + public LazyRow< Item > Item { get; set; } + public LazyRow< TerritoryType >[] Location { get; set; } + public SeString Unknown8 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< ushort >( 0 ); - Item = new LazyRow< Item >( lumina, parser.ReadColumn< uint >( 1 ), language ); + Item = new LazyRow< Item >( gameData, parser.ReadColumn< uint >( 1 ), language ); Location = new LazyRow< TerritoryType >[ 6 ]; for( var i = 0; i < 6; i++ ) - Location[ i ] = new LazyRow< TerritoryType >( lumina, parser.ReadColumn< ushort >( 2 + i ), language ); + Location[ i ] = new LazyRow< TerritoryType >( gameData, parser.ReadColumn< ushort >( 2 + i ), language ); Unknown8 = parser.ReadColumn< SeString >( 8 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/YardCatalogCategory.cs b/src/Lumina.Excel/GeneratedSheets/YardCatalogCategory.cs index 8e8800b9..791d9694 100644 --- a/src/Lumina.Excel/GeneratedSheets/YardCatalogCategory.cs +++ b/src/Lumina.Excel/GeneratedSheets/YardCatalogCategory.cs @@ -7,20 +7,16 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "YardCatalogCategory", columnHash: 0xc8b7ab9b )] - public class YardCatalogCategory : IExcelRow + public class YardCatalogCategory : ExcelRow { - public SeString Category; - public ushort Unknown1; - public byte Unknown2; + public SeString Category { get; set; } + public ushort Unknown1 { get; set; } + public byte Unknown2 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Category = parser.ReadColumn< SeString >( 0 ); Unknown1 = parser.ReadColumn< ushort >( 1 ); diff --git a/src/Lumina.Excel/GeneratedSheets/YardCatalogItemList.cs b/src/Lumina.Excel/GeneratedSheets/YardCatalogItemList.cs index e4ab2aff..e63e4b41 100644 --- a/src/Lumina.Excel/GeneratedSheets/YardCatalogItemList.cs +++ b/src/Lumina.Excel/GeneratedSheets/YardCatalogItemList.cs @@ -7,23 +7,19 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "YardCatalogItemList", columnHash: 0x24e9963a )] - public class YardCatalogItemList : IExcelRow + public class YardCatalogItemList : ExcelRow { - public LazyRow< YardCatalogCategory > Category; - public LazyRow< Item > Item; - public ushort Patch; + public LazyRow< YardCatalogCategory > Category { get; set; } + public LazyRow< Item > Item { get; set; } + public ushort Patch { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); - Category = new LazyRow< YardCatalogCategory >( lumina, parser.ReadColumn< ushort >( 0 ), language ); - Item = new LazyRow< Item >( lumina, parser.ReadColumn< int >( 1 ), language ); + Category = new LazyRow< YardCatalogCategory >( gameData, parser.ReadColumn< ushort >( 0 ), language ); + Item = new LazyRow< Item >( gameData, parser.ReadColumn< int >( 1 ), language ); Patch = parser.ReadColumn< ushort >( 2 ); } } diff --git a/src/Lumina.Excel/GeneratedSheets/ZoneSharedGroup.cs b/src/Lumina.Excel/GeneratedSheets/ZoneSharedGroup.cs index 2a5844da..a6bf35fe 100644 --- a/src/Lumina.Excel/GeneratedSheets/ZoneSharedGroup.cs +++ b/src/Lumina.Excel/GeneratedSheets/ZoneSharedGroup.cs @@ -7,70 +7,66 @@ namespace Lumina.Excel.GeneratedSheets { [Sheet( "ZoneSharedGroup", columnHash: 0xfa71ca60 )] - public class ZoneSharedGroup : IExcelRow + public class ZoneSharedGroup : ExcelRow { - public uint Unknown0; - public byte Unknown1; - public LazyRow< Quest > Quest1; - public uint Unknown3; - public bool Unknown4; - public byte Unknown5; - public LazyRow< Quest > Quest2; - public uint Unknown7; - public bool Unknown8; - public byte Unknown9; - public LazyRow< Quest > Quest3; - public uint Unknown11; - public bool Unknown12; - public byte Unknown13; - public LazyRow< Quest > Quest4; - public uint Unknown15; - public bool Unknown16; - public byte Unknown17; - public LazyRow< Quest > Quest5; - public uint Unknown19; - public bool Unknown20; - public byte Unknown21; - public LazyRow< Quest > Quest6; - public uint Unknown23; - public bool Unknown24; - public byte Unknown25; - public uint Unknown26; - public uint Unknown27; - public bool Unknown28; + public uint Unknown0 { get; set; } + public byte Unknown1 { get; set; } + public LazyRow< Quest > Quest1 { get; set; } + public uint Unknown3 { get; set; } + public bool Unknown4 { get; set; } + public byte Unknown5 { get; set; } + public LazyRow< Quest > Quest2 { get; set; } + public uint Unknown7 { get; set; } + public bool Unknown8 { get; set; } + public byte Unknown9 { get; set; } + public LazyRow< Quest > Quest3 { get; set; } + public uint Unknown11 { get; set; } + public bool Unknown12 { get; set; } + public byte Unknown13 { get; set; } + public LazyRow< Quest > Quest4 { get; set; } + public uint Unknown15 { get; set; } + public bool Unknown16 { get; set; } + public byte Unknown17 { get; set; } + public LazyRow< Quest > Quest5 { get; set; } + public uint Unknown19 { get; set; } + public bool Unknown20 { get; set; } + public byte Unknown21 { get; set; } + public LazyRow< Quest > Quest6 { get; set; } + public uint Unknown23 { get; set; } + public bool Unknown24 { get; set; } + public byte Unknown25 { get; set; } + public uint Unknown26 { get; set; } + public uint Unknown27 { get; set; } + public bool Unknown28 { get; set; } - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); Unknown0 = parser.ReadColumn< uint >( 0 ); Unknown1 = parser.ReadColumn< byte >( 1 ); - Quest1 = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 2 ), language ); + Quest1 = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 2 ), language ); Unknown3 = parser.ReadColumn< uint >( 3 ); Unknown4 = parser.ReadColumn< bool >( 4 ); Unknown5 = parser.ReadColumn< byte >( 5 ); - Quest2 = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 6 ), language ); + Quest2 = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 6 ), language ); Unknown7 = parser.ReadColumn< uint >( 7 ); Unknown8 = parser.ReadColumn< bool >( 8 ); Unknown9 = parser.ReadColumn< byte >( 9 ); - Quest3 = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 10 ), language ); + Quest3 = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 10 ), language ); Unknown11 = parser.ReadColumn< uint >( 11 ); Unknown12 = parser.ReadColumn< bool >( 12 ); Unknown13 = parser.ReadColumn< byte >( 13 ); - Quest4 = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 14 ), language ); + Quest4 = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 14 ), language ); Unknown15 = parser.ReadColumn< uint >( 15 ); Unknown16 = parser.ReadColumn< bool >( 16 ); Unknown17 = parser.ReadColumn< byte >( 17 ); - Quest5 = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 18 ), language ); + Quest5 = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 18 ), language ); Unknown19 = parser.ReadColumn< uint >( 19 ); Unknown20 = parser.ReadColumn< bool >( 20 ); Unknown21 = parser.ReadColumn< byte >( 21 ); - Quest6 = new LazyRow< Quest >( lumina, parser.ReadColumn< uint >( 22 ), language ); + Quest6 = new LazyRow< Quest >( gameData, parser.ReadColumn< uint >( 22 ), language ); Unknown23 = parser.ReadColumn< uint >( 23 ); Unknown24 = parser.ReadColumn< bool >( 24 ); Unknown25 = parser.ReadColumn< byte >( 25 ); diff --git a/src/Lumina.Excel/Lumina.Excel.csproj b/src/Lumina.Excel/Lumina.Excel.csproj index 1fc79fa6..98773d14 100644 --- a/src/Lumina.Excel/Lumina.Excel.csproj +++ b/src/Lumina.Excel/Lumina.Excel.csproj @@ -13,11 +13,11 @@ - + - + @@ -27,7 +27,7 @@ - + diff --git a/src/Lumina.SheetTool/Lumina.SheetTool.csproj b/src/Lumina.SheetTool/Lumina.SheetTool.csproj new file mode 100644 index 00000000..9590466a --- /dev/null +++ b/src/Lumina.SheetTool/Lumina.SheetTool.csproj @@ -0,0 +1,8 @@ + + + + Exe + net5.0 + + + diff --git a/src/Lumina.SheetTool/Models/ColumnDefinition.cs b/src/Lumina.SheetTool/Models/ColumnDefinition.cs new file mode 100644 index 00000000..6c5830f4 --- /dev/null +++ b/src/Lumina.SheetTool/Models/ColumnDefinition.cs @@ -0,0 +1,20 @@ +namespace Lumina.SheetTool.Models +{ + public enum DefinitionType + { + None, + Enum, + Array + } + + public class ColumnDefinition + { + public uint Id { get; set; } + + public DefinitionType Type { get; set; } + + public uint? Length { get; set; } + + public string References { get; set; } + } +} \ No newline at end of file diff --git a/src/Lumina.SheetTool/Models/SheetDefinition.cs b/src/Lumina.SheetTool/Models/SheetDefinition.cs new file mode 100644 index 00000000..a7fddda1 --- /dev/null +++ b/src/Lumina.SheetTool/Models/SheetDefinition.cs @@ -0,0 +1,26 @@ +namespace Lumina.SheetTool.Models +{ + public enum SheetDefinitionMode + { + Columns, + Offset + } + + public class SheetDefinition + { + /// + /// The excel sheet name. + /// + /// + /// Case sensitive. + /// + public string Name { get; set; } + + /// + /// The hash of the columns data in the header to validate data integrity. + /// + public uint ColumnHash { get; set; } + + public SheetDefinitionMode DefinitionMode { get; set; } + } +} \ No newline at end of file diff --git a/src/Lumina.SheetTool/Program.cs b/src/Lumina.SheetTool/Program.cs new file mode 100644 index 00000000..0dc323eb --- /dev/null +++ b/src/Lumina.SheetTool/Program.cs @@ -0,0 +1,12 @@ +using System; + +namespace Lumina.SheetTool +{ + class Program + { + static void Main( string[] args ) + { + Console.WriteLine( "Hello World!" ); + } + } +} \ No newline at end of file diff --git a/src/Lumina.SpaghettiGenerator/CodeGen/GroupStructGenerator.cs b/src/Lumina.SpaghettiGenerator/CodeGen/GroupStructGenerator.cs index 29816510..6b74b49b 100644 --- a/src/Lumina.SpaghettiGenerator/CodeGen/GroupStructGenerator.cs +++ b/src/Lumina.SpaghettiGenerator/CodeGen/GroupStructGenerator.cs @@ -20,7 +20,7 @@ public GroupStructGenerator( string typeName, string fieldName, uint columnId, L public override void WriteFields( StringBuilder sb ) { - sb.AppendLine( $"public {TypeName}[] {FieldName};" ); + sb.AppendLine( $"public {TypeName}[] {FieldName} {{ get; set; }}" ); } public override void WriteReaders( StringBuilder sb ) diff --git a/src/Lumina.SpaghettiGenerator/CodeGen/LazyRowGenerator.cs b/src/Lumina.SpaghettiGenerator/CodeGen/LazyRowGenerator.cs index c63edfc6..714a0003 100644 --- a/src/Lumina.SpaghettiGenerator/CodeGen/LazyRowGenerator.cs +++ b/src/Lumina.SpaghettiGenerator/CodeGen/LazyRowGenerator.cs @@ -14,7 +14,7 @@ public LazyRowGenerator( string typeName, string fieldName, uint columnId, Excel public override void WriteFields( StringBuilder sb ) { - sb.AppendLine( $"public LazyRow< {TypeName} > {FieldName};" ); + sb.AppendLine( $"public LazyRow< {TypeName} > {FieldName} {{ get; set; }}" ); } public override void WriteReaders( StringBuilder sb ) @@ -26,7 +26,7 @@ public override void WriteReaders( StringBuilder sb ) } var type = SpaghettiGenerator.ExcelTypeToManaged( _cols[ ColumnId ].Type ); - sb.AppendLine( $"{FieldName} = new LazyRow< {TypeName} >( lumina, parser.ReadColumn< {type} >( {ColumnId} ), language );" ); + sb.AppendLine( $"{FieldName} = new LazyRow< {TypeName} >( gameData, parser.ReadColumn< {type} >( {ColumnId} ), language );" ); } } } \ No newline at end of file diff --git a/src/Lumina.SpaghettiGenerator/CodeGen/LazyRowRepeatGenerator.cs b/src/Lumina.SpaghettiGenerator/CodeGen/LazyRowRepeatGenerator.cs index 8175d209..3b135fa1 100644 --- a/src/Lumina.SpaghettiGenerator/CodeGen/LazyRowRepeatGenerator.cs +++ b/src/Lumina.SpaghettiGenerator/CodeGen/LazyRowRepeatGenerator.cs @@ -16,7 +16,7 @@ public LazyRowRepeatGenerator( string typeName, string fieldName, uint columnId, public override void WriteFields( StringBuilder sb ) { - sb.AppendLine( $"public LazyRow< {TypeName} >[] {FieldName};" ); + sb.AppendLine( $"public LazyRow< {TypeName} >[] {FieldName} {{ get; set; }}" ); } public override void WriteReaders( StringBuilder sb ) @@ -32,7 +32,7 @@ public override void WriteReaders( StringBuilder sb ) sb.AppendLine( $"{FieldName} = new LazyRow< {TypeName} >[ {Count} ];" ); sb.AppendLine( $"for( var i = 0; i < {Count}; i++ )" ); - sb.AppendLine( $" {FieldName}[ i ] = new LazyRow< {TypeName} >( lumina, parser.ReadColumn< {type} >( {ColumnId} + i ), language );" ); + sb.AppendLine( $" {FieldName}[ i ] = new LazyRow< {TypeName} >( gameData, parser.ReadColumn< {type} >( {ColumnId} + i ), language );" ); } } } \ No newline at end of file diff --git a/src/Lumina.SpaghettiGenerator/CodeGen/PrimitiveGenerator.cs b/src/Lumina.SpaghettiGenerator/CodeGen/PrimitiveGenerator.cs index 6f1ba7ee..12e1cd08 100644 --- a/src/Lumina.SpaghettiGenerator/CodeGen/PrimitiveGenerator.cs +++ b/src/Lumina.SpaghettiGenerator/CodeGen/PrimitiveGenerator.cs @@ -10,7 +10,7 @@ public PrimitiveGenerator( string typeName, string fieldName, uint columnId ) : public override void WriteFields( StringBuilder sb ) { - sb.AppendLine( $"public {TypeName} {FieldName};" ); + sb.AppendLine( $"public {TypeName} {FieldName} {{ get; set; }}" ); } public override void WriteReaders( StringBuilder sb ) diff --git a/src/Lumina.SpaghettiGenerator/CodeGen/PrimitiveRepeatGenerator.cs b/src/Lumina.SpaghettiGenerator/CodeGen/PrimitiveRepeatGenerator.cs index 77feb5af..58cc89c9 100644 --- a/src/Lumina.SpaghettiGenerator/CodeGen/PrimitiveRepeatGenerator.cs +++ b/src/Lumina.SpaghettiGenerator/CodeGen/PrimitiveRepeatGenerator.cs @@ -13,7 +13,7 @@ public PrimitiveRepeatGenerator( string typeName, string fieldName, uint columnI public override void WriteFields( StringBuilder sb ) { - sb.AppendLine( $"public {TypeName}[] {FieldName};" ); + sb.AppendLine( $"public {TypeName}[] {FieldName} {{ get; set; }}" ); } public override void WriteReaders( StringBuilder sb ) diff --git a/src/Lumina.SpaghettiGenerator/Program.cs b/src/Lumina.SpaghettiGenerator/Program.cs index 34a7c749..cdf7ba72 100644 --- a/src/Lumina.SpaghettiGenerator/Program.cs +++ b/src/Lumina.SpaghettiGenerator/Program.cs @@ -1,12 +1,5 @@ using System; -using System.Collections.Generic; -using System.Data.Common; using System.IO; -using System.Linq; -using System.Text; -using Lumina.Data.Structs.Excel; -using Lumina.SpaghettiGenerator.CodeGen; -using Newtonsoft.Json; namespace Lumina.SpaghettiGenerator { diff --git a/src/Lumina.SpaghettiGenerator/SpaghettiGenerator.cs b/src/Lumina.SpaghettiGenerator/SpaghettiGenerator.cs index 15d24d8f..77e407a3 100644 --- a/src/Lumina.SpaghettiGenerator/SpaghettiGenerator.cs +++ b/src/Lumina.SpaghettiGenerator/SpaghettiGenerator.cs @@ -11,12 +11,12 @@ namespace Lumina.SpaghettiGenerator { public class SpaghettiGenerator { - public Lumina _lumina; + public GameData GameData; public string _sheetTemplate; public SpaghettiGenerator(string path, string tmplPath = null) { - _lumina = new Lumina( path ); + GameData = new GameData( path ); _sheetTemplate = File.ReadAllText( tmplPath ?? "class.tmpl" ); } @@ -104,7 +104,7 @@ public string ProcessDefinition( string name ) var def = File.ReadAllText( path ); var tmpl = _sheetTemplate; - var sheet = _lumina.Excel.GetSheetRaw( name ); + var sheet = GameData.Excel.GetSheetRaw( name ); if( sheet == null ) { Console.WriteLine( $" - sheet {name} no longer exists!" ); diff --git a/src/Lumina.SpaghettiGenerator/class.tmpl b/src/Lumina.SpaghettiGenerator/class.tmpl index a1392b7e..699a877c 100644 --- a/src/Lumina.SpaghettiGenerator/class.tmpl +++ b/src/Lumina.SpaghettiGenerator/class.tmpl @@ -7,17 +7,13 @@ using Lumina.Data.Structs.Excel; namespace Lumina.Excel.GeneratedSheets { [Sheet( "%%SHEET_NAME%%", columnHash: %%COL_HASH%% )] - public class %%SHEET_NAME%% : IExcelRow + public class %%SHEET_NAME%% : ExcelRow { %%STRUCT_DEFS%% %%DATA_MEMBERS%% - public uint RowId { get; set; } - public uint SubRowId { get; set; } - - public void PopulateData( RowParser parser, Lumina lumina, Language language ) + public override void PopulateData( RowParser parser, GameData gameData, Language language ) { - RowId = parser.Row; - SubRowId = parser.SubRow; + base.PopulateData( parser, gameData, language ); %%DATA_READERS%% } diff --git a/src/Lumina.Tests/LuminaTests.cs b/src/Lumina.Tests/LuminaTests.cs index 202701dc..34c37dae 100644 --- a/src/Lumina.Tests/LuminaTests.cs +++ b/src/Lumina.Tests/LuminaTests.cs @@ -1,4 +1,3 @@ -using System; using Xunit; namespace Lumina.Tests @@ -13,7 +12,7 @@ public class LuminaTests [InlineData( "exd", "ffxiv", 16400836168543909290, "exd/exportedsg.exh")] public void FilePathsAreParsedCorrectly( string category, string repo, ulong hash, string path ) { - var parsed = Lumina.ParseFilePath( path ); + var parsed = GameData.ParseFilePath( path ); Assert.Equal( category, parsed.Category ); Assert.Equal( repo, parsed.Repository ); diff --git a/src/Lumina.sln b/src/Lumina.sln index 6a3743aa..3c923aeb 100644 --- a/src/Lumina.sln +++ b/src/Lumina.sln @@ -17,6 +17,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lumina.Excel", "Lumina.Exce EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{C3DB5F15-1172-4938-B946-281EC006FEB1}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lumina.SheetTool", "Lumina.SheetTool\Lumina.SheetTool.csproj", "{ED7CD396-EF84-4A03-9A71-EE7FB254063C}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -47,6 +49,10 @@ Global {74F94760-A77E-496D-9D6F-98BD20EABE26}.Debug|Any CPU.Build.0 = Debug|Any CPU {74F94760-A77E-496D-9D6F-98BD20EABE26}.Release|Any CPU.ActiveCfg = Release|Any CPU {74F94760-A77E-496D-9D6F-98BD20EABE26}.Release|Any CPU.Build.0 = Release|Any CPU + {ED7CD396-EF84-4A03-9A71-EE7FB254063C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {ED7CD396-EF84-4A03-9A71-EE7FB254063C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {ED7CD396-EF84-4A03-9A71-EE7FB254063C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {ED7CD396-EF84-4A03-9A71-EE7FB254063C}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -54,6 +60,7 @@ Global GlobalSection(NestedProjects) = preSolution {206E65C3-5CDF-4FB1-B66A-A0A8BDCDFBC2} = {C3DB5F15-1172-4938-B946-281EC006FEB1} {3637C5FA-3A4F-4275-9C61-4C8CAC955B49} = {C3DB5F15-1172-4938-B946-281EC006FEB1} + {ED7CD396-EF84-4A03-9A71-EE7FB254063C} = {C3DB5F15-1172-4938-B946-281EC006FEB1} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {8FD3CADC-B9E1-4895-BC09-22F64EF67C79} diff --git a/src/Lumina/Data/Attributes/FileExtensionAttribute.cs b/src/Lumina/Data/Attributes/FileExtensionAttribute.cs new file mode 100644 index 00000000..91ebbfa1 --- /dev/null +++ b/src/Lumina/Data/Attributes/FileExtensionAttribute.cs @@ -0,0 +1,15 @@ +using System; + +namespace Lumina.Data.Attributes +{ + [AttributeUsage( AttributeTargets.Class )] + public class FileExtensionAttribute : Attribute + { + public readonly string Extension; + + public FileExtensionAttribute( string extension ) + { + Extension = extension; + } + } +} \ No newline at end of file diff --git a/src/Lumina/Data/FileOptionsAttribute.cs b/src/Lumina/Data/Attributes/FileOptionsAttribute.cs similarity index 96% rename from src/Lumina/Data/FileOptionsAttribute.cs rename to src/Lumina/Data/Attributes/FileOptionsAttribute.cs index 19ede42a..57383718 100644 --- a/src/Lumina/Data/FileOptionsAttribute.cs +++ b/src/Lumina/Data/Attributes/FileOptionsAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace Lumina.Data +namespace Lumina.Data.Attributes { [AttributeUsage( AttributeTargets.Class )] public class FileOptionsAttribute : Attribute diff --git a/src/Lumina/Data/Category.cs b/src/Lumina/Data/Category.cs index 58c83c1e..4bb7427d 100644 --- a/src/Lumina/Data/Category.cs +++ b/src/Lumina/Data/Category.cs @@ -1,15 +1,13 @@ using System; using System.Collections.Generic; using System.IO; -using System.Linq; using Lumina.Data.Structs; -using Microsoft.VisualBasic; namespace Lumina.Data { public class Category { - private readonly Lumina _Lumina; + private readonly GameData _gameData; public DirectoryInfo RootDir { get; } public byte CategoryId { get; } @@ -34,9 +32,9 @@ internal Category( PlatformId platform, SqPackIndex index, DirectoryInfo rootDir, - Lumina lumina ) + GameData gameData ) { - _Lumina = lumina; + _gameData = gameData; CategoryId = category; Expansion = expansion; Chunk = chunk; @@ -57,7 +55,7 @@ internal Category( if( fileInfo.Exists ) { - DatFiles[ id ] = new SqPack( fileInfo, _Lumina ); + DatFiles[ id ] = new SqPack( fileInfo, _gameData ); } } diff --git a/src/Lumina/Data/FileHandle.cs b/src/Lumina/Data/FileHandle.cs index d883f382..46600f6c 100644 --- a/src/Lumina/Data/FileHandle.cs +++ b/src/Lumina/Data/FileHandle.cs @@ -10,14 +10,14 @@ public enum FileState Error } - internal BaseFileHandle( Lumina lumina, string path ) + internal BaseFileHandle( GameData gameData, string path ) { - _lumina = lumina; + GameData = gameData; _path = path; } protected FileState _state = FileState.None; - protected Lumina _lumina; + protected GameData GameData; protected string _path; protected object _instance; @@ -41,14 +41,14 @@ public virtual void Load() /// The type of FileResource to wrap public class FileHandle< T > : BaseFileHandle where T : FileResource { - internal FileHandle( Lumina lumina, string path ) : base( lumina, path ) + internal FileHandle( GameData gameData, string path ) : base( gameData, path ) { } public override void Load() { _state = FileState.Loading; - var file = _lumina.GetFile< T >( _path ); + var file = GameData.GetFile< T >( _path ); if( file == null ) { diff --git a/src/Lumina/Data/FileHandleManager.cs b/src/Lumina/Data/FileHandleManager.cs index 6dec9e10..ee617bd2 100644 --- a/src/Lumina/Data/FileHandleManager.cs +++ b/src/Lumina/Data/FileHandleManager.cs @@ -1,31 +1,29 @@ using System; using System.Collections.Concurrent; -using System.Collections.Generic; -using System.Linq; namespace Lumina.Data { public class FileHandleManager { - private readonly Lumina _lumina; + private readonly GameData _gameData; private readonly ConcurrentQueue< WeakReference< BaseFileHandle > > _fileQueue; - internal FileHandleManager( Lumina lumina ) + internal FileHandleManager( GameData gameData ) { - _lumina = lumina; + _gameData = gameData; _fileQueue = new ConcurrentQueue< WeakReference< BaseFileHandle > >(); } /// /// Creates a new handle to a game file but does not load it. You will need to call or the wrapper function - /// yourself for these handles to be loaded, on a different thread. + /// yourself for these handles to be loaded, on a different thread. /// /// The path to the file to load /// The type of to load /// A handle to the file to be loaded public FileHandle< T > CreateHandle< T >( string path ) where T : FileResource { - var handle = new FileHandle< T >( _lumina, path ); + var handle = new FileHandle< T >( _gameData, path ); var weakRef = new WeakReference< BaseFileHandle >( handle ); _fileQueue.Enqueue( weakRef ); diff --git a/src/Lumina/Data/FileResource.cs b/src/Lumina/Data/FileResource.cs index e1bdd84e..37265146 100644 --- a/src/Lumina/Data/FileResource.cs +++ b/src/Lumina/Data/FileResource.cs @@ -1,9 +1,6 @@ using System; -using System.Collections.Generic; using System.IO; using System.Text; -using System.Threading.Tasks; -using Lumina.Data.Structs; namespace Lumina.Data { diff --git a/src/Lumina/Data/Files/Excel/ExcelDataFile.cs b/src/Lumina/Data/Files/Excel/ExcelDataFile.cs index 146299f3..dcae53d4 100644 --- a/src/Lumina/Data/Files/Excel/ExcelDataFile.cs +++ b/src/Lumina/Data/Files/Excel/ExcelDataFile.cs @@ -3,11 +3,13 @@ using System.Collections.Generic; using System.IO; using System.Runtime.CompilerServices; +using Lumina.Data.Attributes; using Lumina.Data.Structs.Excel; using Lumina.Extensions; namespace Lumina.Data.Files.Excel { + [FileExtension( ".exd" )] public class ExcelDataFile : FileResource { public ExcelDataFile() @@ -17,7 +19,7 @@ public ExcelDataFile() public ExcelDataHeader Header { get; protected set; } public Dictionary< uint, ExcelDataOffset > RowData { get; protected set; } - + /// /// Whether the endianness of the underlying data has been swapped so it doesn't happen twice /// diff --git a/src/Lumina/Data/Files/Excel/ExcelHeaderFile.cs b/src/Lumina/Data/Files/Excel/ExcelHeaderFile.cs index 4b8b7c0f..63faa016 100644 --- a/src/Lumina/Data/Files/Excel/ExcelHeaderFile.cs +++ b/src/Lumina/Data/Files/Excel/ExcelHeaderFile.cs @@ -1,18 +1,16 @@ using System; using System.Buffers.Binary; -using System.Collections.Generic; using System.IO; using System.Linq; using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; +using Lumina.Data.Attributes; using Lumina.Data.Structs.Excel; using Lumina.Extensions; -using System.Net; -using System.Text; using Lumina.Misc; namespace Lumina.Data.Files.Excel { + [FileExtension( ".exh" )] public class ExcelHeaderFile : FileResource { public ExcelHeaderFile() @@ -61,7 +59,7 @@ public override unsafe void LoadFile() ColumnDefinitions = Reader.ReadStructuresAsArray< ExcelColumnDefinition >( header.ColumnCount ); DataPages = Reader.ReadStructuresAsArray< ExcelDataPagination >( header.PageCount ); - + // todo: these are LE? what the fuck? am i going insane? Languages = Reader.ReadStructures< ushort >( header.LanguageCount ).Select( lang => (Language)lang ).ToArray(); @@ -85,7 +83,7 @@ public override unsafe void LoadFile() db.StartId = BinaryPrimitives.ReverseEndianness( db.StartId ); } } - + public uint GetColumnsHash() { var headerSize = Unsafe.SizeOf< ExcelHeaderHeader >(); diff --git a/src/Lumina/Data/Files/Excel/ExcelListFile.cs b/src/Lumina/Data/Files/Excel/ExcelListFile.cs index d1bb3acf..177a077b 100644 --- a/src/Lumina/Data/Files/Excel/ExcelListFile.cs +++ b/src/Lumina/Data/Files/Excel/ExcelListFile.cs @@ -1,11 +1,13 @@ using System; using System.Collections.Generic; using System.IO; +using Lumina.Data.Attributes; // ReSharper disable MemberCanBePrivate.Global namespace Lumina.Data.Files.Excel { + [FileExtension( ".exl" )] public class ExcelListFile : FileResource { public readonly Dictionary< string, int > ExdMap; @@ -21,9 +23,7 @@ public ExcelListFile() public override void LoadFile() { - // todo: not sure if good idea yet - using var stream = new MemoryStream( Data, false ); - using var sr = new StreamReader( stream ); + using var sr = new StreamReader( FileStream ); // read version var headerStr = sr.ReadLine(); @@ -52,6 +52,8 @@ public override void LoadFile() ExdMap[ data[ 0 ] ] = id; } + + FileStream.Position = 0; } } } \ No newline at end of file diff --git a/src/Lumina/Data/Files/HwcFile.cs b/src/Lumina/Data/Files/HwcFile.cs index 3add8174..558a63cc 100644 --- a/src/Lumina/Data/Files/HwcFile.cs +++ b/src/Lumina/Data/Files/HwcFile.cs @@ -1,15 +1,18 @@ +using Lumina.Data.Attributes; + namespace Lumina.Data.Files { + [FileExtension( ".hwc" )] public class HwcFile : FileResource { // Hardware Cursors have a fixed size public const int Width = 64; public const int Height = 64; - + public override void LoadFile() { // Format should be in ABGR (or possibly ARGB?) Data = Reader.ReadBytes( Width * Height * 4 ); } } -} +} \ No newline at end of file diff --git a/src/Lumina/Data/Files/ImcFile.cs b/src/Lumina/Data/Files/ImcFile.cs index 9b11d587..c38ba0e5 100644 --- a/src/Lumina/Data/Files/ImcFile.cs +++ b/src/Lumina/Data/Files/ImcFile.cs @@ -1,11 +1,13 @@ using System; using System.Collections.Generic; using System.IO; +using Lumina.Data.Attributes; namespace Lumina.Data.Files { //TODO: add gear-specific functionality, hopefully when we get //useful enums like GearSlot.Mainhand or something + [FileExtension( ".imc" )] public class ImcFile : FileResource { public struct ImageChangeData @@ -16,12 +18,12 @@ public struct ImageChangeData // AttrMask : 10, SoundId : 6 private ushort _AttributeAndSound; - public ushort AttributeMask => (ushort) ( _AttributeAndSound & 0x3FF ); - public ushort SoundId => (ushort) ( _AttributeAndSound & 0xFC00 ); + public ushort AttributeMask => (ushort)( _AttributeAndSound & 0x3FF ); + public ushort SoundId => (ushort)( _AttributeAndSound & 0xFC00 ); public byte VfxId; private byte _MaterialAnimationIdMask; - public byte MaterialAnimationId => (byte) ( _MaterialAnimationIdMask & 0xF000 ); + public byte MaterialAnimationId => (byte)( _MaterialAnimationIdMask & 0xF000 ); public static ImageChangeData Read( BinaryReader br ) { diff --git a/src/Lumina/Data/Files/LgbFile.cs b/src/Lumina/Data/Files/LgbFile.cs index 2f0f16c6..a04073d0 100644 --- a/src/Lumina/Data/Files/LgbFile.cs +++ b/src/Lumina/Data/Files/LgbFile.cs @@ -1,7 +1,5 @@ -using System; -using System.Collections.Generic; using System.IO; -using System.Text; +using Lumina.Data.Attributes; using Lumina.Data.Parsing.Layer; using Lumina.Extensions; @@ -10,6 +8,7 @@ namespace Lumina.Data.Files { + [FileExtension( ".lgb" )] public class LgbFile : FileResource { public struct FileHeader @@ -49,4 +48,4 @@ public override void LoadFile() } } } -} +} \ No newline at end of file diff --git a/src/Lumina/Data/Files/TexFile.cs b/src/Lumina/Data/Files/TexFile.cs index 0884d63c..b003442b 100644 --- a/src/Lumina/Data/Files/TexFile.cs +++ b/src/Lumina/Data/Files/TexFile.cs @@ -1,16 +1,13 @@ using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; -using System.IO; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using System.Text; -using System.Drawing; +using Lumina.Data.Attributes; using Lumina.Data.Parsing.Tex; using Lumina.Extensions; namespace Lumina.Data.Files { + [FileExtension( ".tex" )] public class TexFile : FileResource { public enum Attribute : uint @@ -56,14 +53,17 @@ public enum TextureFormat TypeDepthStencil = 0x4, TypeSpecial = 0x5, A8R8G8B8 = 0x1450, + // todo: R8G8B8X8 = 0x1451, A8R8G8B82 = 0x1452, R4G4B4A4 = 0x1440, R5G5B5A1 = 0x1441, L8 = 0x1130, + // todo: A8 = 0x1131, + // todo: R32F = 0x2150, R32G32B32A32F = 0x2470, @@ -74,13 +74,14 @@ public enum TextureFormat DXT5 = 0x3431, D16 = 0x4140, D24S8 = 0x4250, + //todo: RGBA8 0x4401 Null = 0x5100, Shadow16 = 0x5140, Shadow24 = 0x5150, } - [StructLayout(LayoutKind.Sequential)] + [StructLayout( LayoutKind.Sequential )] public unsafe struct TexHeader { public Attribute Type; @@ -115,7 +116,7 @@ public override void LoadFile() // converts various formats to A8R8G8B8 private byte[] Convert( Span< byte > src, int width, int height ) { - byte[] dst = new byte[ width * height * 4 ]; + byte[] dst = new byte[width * height * 4]; switch( Header.Format ) { @@ -129,7 +130,7 @@ private byte[] Convert( Span< byte > src, int width, int height ) ProcessDxt5( src, dst, width, height ); break; case TextureFormat.R16G16B16A16F: - ProcessA16R16G16B16_Float( src, dst, width, height); + ProcessA16R16G16B16_Float( src, dst, width, height ); break; case TextureFormat.R5G5B5A1: ProcessA1R5G5B5( src, dst, width, height ); @@ -161,11 +162,11 @@ private static void ProcessA16R16G16B16_Float( Span< byte > src, byte[] dst, int var dstOff = i * 4; for( var j = 0; j < 4; ++j ) - dst[dstOff + j] = (byte)(src.Unpack( srcOff + j * 2 ) * byte.MaxValue ); + dst[ dstOff + j ] = (byte)( src.Unpack( srcOff + j * 2 ) * byte.MaxValue ); } } - private static void ProcessA1R5G5B5( Span src, byte[] dst, int width, int height ) + private static void ProcessA1R5G5B5( Span< byte > src, byte[] dst, int width, int height ) { for( var i = 0; ( i + 2 ) <= 2 * width * height; i += 2 ) { @@ -180,59 +181,59 @@ private static void ProcessA1R5G5B5( Span src, byte[] dst, int width, int var argbValue = ( a * 0x1FE00 | rgb | ( ( rgb >> 5 ) & 0x070707 ) ); for( var j = 0; j < 4; ++j ) - dst[i * 2 + j] = (byte)( argbValue >> ( 8 * j ) ); + dst[ i * 2 + j ] = (byte)( argbValue >> ( 8 * j ) ); } } - private static void ProcessA4R4G4B4( Span src, byte[] dst, int width, int height ) + private static void ProcessA4R4G4B4( Span< byte > src, byte[] dst, int width, int height ) { for( var i = 0; ( i + 2 ) <= 2 * width * height; i += 2 ) { var v = BitConverter.ToUInt16( src.Slice( i, sizeof( UInt16 ) ).ToArray(), 0 ); for( var j = 0; j < 4; ++j ) - dst[i * 2 + j] = (byte)( ( ( v >> ( 4 * j ) ) & 0x0F ) << 4 ); + dst[ i * 2 + j ] = (byte)( ( ( v >> ( 4 * j ) ) & 0x0F ) << 4 ); } } - private static void ProcessA8R8G8B8( Span src, byte[] dst, int width, int height ) + private static void ProcessA8R8G8B8( Span< byte > src, byte[] dst, int width, int height ) { // Some transparent images have larger dst lengths than their src. var length = Math.Min( src.Length, dst.Length ); - src.Slice( 0, length ).CopyTo(dst.AsSpan()); + src.Slice( 0, length ).CopyTo( dst.AsSpan() ); } - private static void ProcessDxt1( Span src, byte[] dst, int width, int height ) + private static void ProcessDxt1( Span< byte > src, byte[] dst, int width, int height ) { var dec = Squish.DecompressImage( src.ToArray(), width, height, SquishOptions.DXT1 ); Array.Copy( dec, dst, dst.Length ); } - private static void ProcessDxt3( Span src, byte[] dst, int width, int height ) + private static void ProcessDxt3( Span< byte > src, byte[] dst, int width, int height ) { var dec = Squish.DecompressImage( src.ToArray(), width, height, SquishOptions.DXT3 ); Array.Copy( dec, dst, dst.Length ); } - private static void ProcessDxt5( Span src, byte[] dst, int width, int height ) + private static void ProcessDxt5( Span< byte > src, byte[] dst, int width, int height ) { var dec = Squish.DecompressImage( src.ToArray(), width, height, SquishOptions.DXT5 ); Array.Copy( dec, dst, dst.Length ); } - private static void ProcessR3G3B2( Span src, byte[] dst, int width, int height ) + private static void ProcessR3G3B2( Span< byte > src, byte[] dst, int width, int height ) { for( var i = 0; i < width * height; ++i ) { - var r = (uint)( src[i] & 0xE0 ); - var g = (uint)( src[i] & 0x1C ); - var b = (uint)( src[i] & 0x03 ); - - dst[i * 4 + 0] = (byte)( b | ( b << 2 ) | ( b << 4 ) | ( b << 6 ) ); - dst[i * 4 + 1] = (byte)( g | ( g << 3 ) | ( g << 6 ) ); - dst[i * 4 + 2] = (byte)( r | ( r << 3 ) | ( r << 6 ) ); - dst[i * 4 + 3] = 0xFF; + var r = (uint)( src[ i ] & 0xE0 ); + var g = (uint)( src[ i ] & 0x1C ); + var b = (uint)( src[ i ] & 0x03 ); + + dst[ i * 4 + 0 ] = (byte)( b | ( b << 2 ) | ( b << 4 ) | ( b << 6 ) ); + dst[ i * 4 + 1 ] = (byte)( g | ( g << 3 ) | ( g << 6 ) ); + dst[ i * 4 + 2 ] = (byte)( r | ( r << 3 ) | ( r << 6 ) ); + dst[ i * 4 + 3 ] = 0xFF; } } } -} +} \ No newline at end of file diff --git a/src/Lumina/Data/Files/UldFile.cs b/src/Lumina/Data/Files/UldFile.cs index 5c1a4735..71d4cded 100644 --- a/src/Lumina/Data/Files/UldFile.cs +++ b/src/Lumina/Data/Files/UldFile.cs @@ -1,10 +1,14 @@ +using Lumina.Data.Attributes; using Lumina.Data.Parsing.Uld; using Lumina.Extensions; // ReSharper disable NotAccessedField.Global // ReSharper disable MemberCanBePrivate.Global -namespace Lumina.Data.Files { - public class UldFile : FileResource { +namespace Lumina.Data.Files +{ + [FileExtension( ".uld" )] + public class UldFile : FileResource + { public UldRoot.UldHeader CombineHeader; public UldRoot.AtkHeader ComponentHeader; public UldRoot.PartHeader AssetList; @@ -20,13 +24,14 @@ public class UldFile : FileResource { public UldRoot.PartHeader WidgetHeader; public UldRoot.WidgetData WidgetData; - public override void LoadFile() { + public override void LoadFile() + { var basePos = Reader.BaseStream.Position; CombineHeader = UldRoot.UldHeader.Read( Reader ); var preComponentPos = Reader.BaseStream.Position; ComponentHeader = UldRoot.AtkHeader.Read( Reader ); - + Reader.Seek( preComponentPos + ComponentHeader.AssetListOffset ); AssetList = UldRoot.PartHeader.Read( Reader ); AssetData = new UldRoot.TextureEntry[AssetList.ElementCount]; diff --git a/src/Lumina/Data/Parsing/Common.cs b/src/Lumina/Data/Parsing/Common.cs index aea9f5b7..e95232e7 100644 --- a/src/Lumina/Data/Parsing/Common.cs +++ b/src/Lumina/Data/Parsing/Common.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; using System.IO; -using System.Text; namespace Lumina.Data.Parsing { @@ -9,11 +6,11 @@ public class Common { public struct Vector3 { - public float x, y, z; + public float X, Y, Z; public static Vector3 Read( BinaryReader br ) { - return new Vector3 { x = br.ReadSingle(), y = br.ReadSingle(), z = br.ReadSingle() }; + return new Vector3 { X = br.ReadSingle(), Y = br.ReadSingle(), Z = br.ReadSingle() }; } }; diff --git a/src/Lumina/Data/Parsing/Layer/LayerCommon.cs b/src/Lumina/Data/Parsing/Layer/LayerCommon.cs index 00f957f3..548720ed 100644 --- a/src/Lumina/Data/Parsing/Layer/LayerCommon.cs +++ b/src/Lumina/Data/Parsing/Layer/LayerCommon.cs @@ -1,9 +1,6 @@ using System; -using System.Collections.Generic; using System.Diagnostics; using System.IO; -using System.Runtime.InteropServices; -using System.Text; using Lumina.Extensions; using Vector3 = Lumina.Data.Parsing.Common.Vector3; using Transformation = Lumina.Data.Parsing.Common.Transformation; diff --git a/src/Lumina/Data/Parsing/Quad.cs b/src/Lumina/Data/Parsing/Quad.cs index 9a3af416..fee3c660 100644 --- a/src/Lumina/Data/Parsing/Quad.cs +++ b/src/Lumina/Data/Parsing/Quad.cs @@ -1,5 +1,8 @@ using System.Runtime.InteropServices; +// ReSharper disable MemberCanBePrivate.Global +// ReSharper disable FieldCanBeMadeReadOnly.Global + namespace Lumina.Data.Parsing { [StructLayout( LayoutKind.Explicit )] @@ -36,7 +39,7 @@ public struct Quad [FieldOffset(0x0)] public uint U32A; - [FieldOffset(0x1)] + [FieldOffset(0x4)] public uint U32B; public ushort A => U16A; diff --git a/src/Lumina/Data/Parsing/Tex/Alpha.cs b/src/Lumina/Data/Parsing/Tex/Alpha.cs index e7b99f65..026ce6d4 100644 --- a/src/Lumina/Data/Parsing/Tex/Alpha.cs +++ b/src/Lumina/Data/Parsing/Tex/Alpha.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Lumina.Data.Parsing.Tex { // From DotSquish @@ -84,7 +80,7 @@ private static int FitCodes(byte[] rgba, int mask, byte[] codes, out byte[] indi var index = 0; for (int j = 0; j < 8; ++j) { // Get the squared error from this code. - var dist = ((int)value) - ((int)codes[j]); + var dist = value - codes[j]; dist *= dist; // Compare with the best so far. diff --git a/src/Lumina/Data/Parsing/Tex/ClusterFit.cs b/src/Lumina/Data/Parsing/Tex/ClusterFit.cs index bf763436..18e2a612 100644 --- a/src/Lumina/Data/Parsing/Tex/ClusterFit.cs +++ b/src/Lumina/Data/Parsing/Tex/ClusterFit.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Lumina.Data.Parsing.Tex { // From DotSquish diff --git a/src/Lumina/Data/Parsing/Tex/ColourBlock.cs b/src/Lumina/Data/Parsing/Tex/ColourBlock.cs index 9a6dc243..d6add7d8 100644 --- a/src/Lumina/Data/Parsing/Tex/ColourBlock.cs +++ b/src/Lumina/Data/Parsing/Tex/ColourBlock.cs @@ -1,9 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - namespace Lumina.Data.Parsing.Tex { // From DotSquish internal static class ColourBlock { diff --git a/src/Lumina/Data/Parsing/Tex/ColourFit.cs b/src/Lumina/Data/Parsing/Tex/ColourFit.cs index ce0403cf..07e7eb6d 100644 --- a/src/Lumina/Data/Parsing/Tex/ColourFit.cs +++ b/src/Lumina/Data/Parsing/Tex/ColourFit.cs @@ -1,9 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - namespace Lumina.Data.Parsing.Tex { // From DotSquish internal abstract class ColourFit { diff --git a/src/Lumina/Data/Parsing/Tex/ColourSet.cs b/src/Lumina/Data/Parsing/Tex/ColourSet.cs index ce1fb10e..66096f4b 100644 --- a/src/Lumina/Data/Parsing/Tex/ColourSet.cs +++ b/src/Lumina/Data/Parsing/Tex/ColourSet.cs @@ -1,9 +1,4 @@ using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Lumina.Data.Parsing.Tex { // From DotSquish diff --git a/src/Lumina/Data/Parsing/Tex/Flags.cs b/src/Lumina/Data/Parsing/Tex/Flags.cs index 4c679df0..e861dd24 100644 --- a/src/Lumina/Data/Parsing/Tex/Flags.cs +++ b/src/Lumina/Data/Parsing/Tex/Flags.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Lumina.Data.Parsing.Tex { // From DotSquish diff --git a/src/Lumina/Data/Parsing/Tex/Maths.cs b/src/Lumina/Data/Parsing/Tex/Maths.cs index a72c7729..81dc4100 100644 --- a/src/Lumina/Data/Parsing/Tex/Maths.cs +++ b/src/Lumina/Data/Parsing/Tex/Maths.cs @@ -1,151 +1,194 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace Lumina.Data.Parsing.Tex { +namespace Lumina.Data.Parsing.Tex +{ // From DotSquish - internal struct Vector3 { + internal struct Vector3 + { public float X, Y, Z; - public Vector3(float value) { - this.X = this.Y = this.Z = value; + public Vector3( float value ) + { + X = Y = Z = value; } - public Vector3(float x, float y, float z) { - this.X = x; - this.Y = y; - this.Z = z; + + public Vector3( float x, float y, float z ) + { + X = x; + Y = y; + Z = z; } - public static Vector3 operator +(Vector3 v1, Vector3 v2) { - return new Vector3( + public static Vector3 operator +( Vector3 v1, Vector3 v2 ) + { + return new( v1.X + v2.X, v1.Y + v2.Y, v1.Z + v2.Z); } - public static Vector3 operator -(Vector3 v) { - return new Vector3( - - v.X, - - v.Y, - - v.Z); + + public static Vector3 operator -( Vector3 v ) + { + return new( + -v.X, + -v.Y, + -v.Z); } - public static Vector3 operator -(Vector3 v1, Vector3 v2) { - return new Vector3( + + public static Vector3 operator -( Vector3 v1, Vector3 v2 ) + { + return new( v1.X - v2.X, v1.Y - v2.Y, v1.Z - v2.Z); } - public static Vector3 operator *(Vector3 v1, Vector3 v2) { - return new Vector3( + + public static Vector3 operator *( Vector3 v1, Vector3 v2 ) + { + return new( v1.X * v2.X, v1.Y * v2.Y, v1.Z * v2.Z); } - public static Vector3 operator *(Vector3 v1, float v2) { - return new Vector3( + + public static Vector3 operator *( Vector3 v1, float v2 ) + { + return new( v1.X * v2, v1.Y * v2, v1.Z * v2); } - public static Vector3 operator *(float v1, Vector3 v2) { - return (v2 * v1); + + public static Vector3 operator *( float v1, Vector3 v2 ) + { + return ( v2 * v1 ); } - public static Vector3 operator /(Vector3 v1, Vector3 v2) { - return new Vector3( + + public static Vector3 operator /( Vector3 v1, Vector3 v2 ) + { + return new( v1.X / v2.X, v1.Y / v2.Y, v1.Z / v2.Z); } - public static Vector3 operator /(Vector3 v1, float v2) { - return new Vector3( + + public static Vector3 operator /( Vector3 v1, float v2 ) + { + return new( v1.X / v2, v1.Y / v2, v1.Z / v2); } - public static float Dot(Vector3 v1, Vector3 v2) { + public static float Dot( Vector3 v1, Vector3 v2 ) + { return v1.X * v2.X + v1.Y * v2.Y + v1.Z * v2.Z; } - public static Vector3 Min(Vector3 v1, Vector3 v2) { - return new Vector3( - (float)Math.Min(v1.X, v2.X), - (float)Math.Min(v1.Y, v2.Y), - (float)Math.Min(v1.Z, v2.Z)); + + public static Vector3 Min( Vector3 v1, Vector3 v2 ) + { + return new( + Math.Min( v1.X, v2.X ), + Math.Min( v1.Y, v2.Y ), + Math.Min( v1.Z, v2.Z )); } - public static Vector3 Max(Vector3 v1, Vector3 v2) { - return new Vector3( - (float)Math.Max(v1.X, v2.X), - (float)Math.Max(v1.Y, v2.Y), - (float)Math.Max(v1.Z, v2.Z)); + + public static Vector3 Max( Vector3 v1, Vector3 v2 ) + { + return new( + Math.Max( v1.X, v2.X ), + Math.Max( v1.Y, v2.Y ), + Math.Max( v1.Z, v2.Z )); } - public static Vector3 Max(Vector3 v) { - return new Vector3( - (float)(v.X > 0f ? Math.Floor(v.X) : Math.Ceiling(v.X)), - (float)(v.Y > 0f ? Math.Floor(v.Y) : Math.Ceiling(v.Y)), - (float)(v.Z > 0f ? Math.Floor(v.Z) : Math.Ceiling(v.Z))); + + public static Vector3 Max( Vector3 v ) + { + return new( + (float)( v.X > 0f ? Math.Floor( v.X ) : Math.Ceiling( v.X ) ), + (float)( v.Y > 0f ? Math.Floor( v.Y ) : Math.Ceiling( v.Y ) ), + (float)( v.Z > 0f ? Math.Floor( v.Z ) : Math.Ceiling( v.Z ) )); } } - internal struct Vector4 { + + internal struct Vector4 + { public float X, Y, Z, W; - public Vector4(float value) { - this.X = this.Y = this.Z = this.W = value; + public Vector4( float value ) + { + X = Y = Z = W = value; } - public Vector4(float x, float y, float z, float w) { - this.X = x; - this.Y = y; - this.Z = z; - this.W = w; + + public Vector4( float x, float y, float z, float w ) + { + X = x; + Y = y; + Z = z; + W = w; } - public static Vector4 operator +(Vector4 v1, Vector4 v2) { - return new Vector4( + public static Vector4 operator +( Vector4 v1, Vector4 v2 ) + { + return new( v1.X + v2.X, v1.Y + v2.Y, v1.Z + v2.Z, v1.W + v2.W); } - public static Vector4 operator -(Vector4 v) { - return new Vector4( + + public static Vector4 operator -( Vector4 v ) + { + return new( -v.X, -v.Y, -v.Z, -v.W); } - public static Vector4 operator -(Vector4 v1, Vector4 v2) { - return new Vector4( + + public static Vector4 operator -( Vector4 v1, Vector4 v2 ) + { + return new( v1.X - v2.X, v1.Y - v2.Y, v1.Z - v2.Z, v1.W - v2.W); } - public static Vector4 operator *(Vector4 v1, Vector4 v2) { - return new Vector4( + + public static Vector4 operator *( Vector4 v1, Vector4 v2 ) + { + return new( v1.X * v2.X, v1.Y * v2.Y, v1.Z * v2.Z, v1.W * v2.W); } - public static Vector4 operator *(Vector4 v1, float v2) { - return new Vector4( + + public static Vector4 operator *( Vector4 v1, float v2 ) + { + return new( v1.X * v2, v1.Y * v2, v1.Z * v2, v1.W * v2); } - public static Vector4 operator *(float v1, Vector4 v2) { - return (v2 * v1); + + public static Vector4 operator *( float v1, Vector4 v2 ) + { + return ( v2 * v1 ); } - public static Vector4 operator /(Vector4 v1, Vector4 v2) { - return new Vector4( + + public static Vector4 operator /( Vector4 v1, Vector4 v2 ) + { + return new( v1.X / v2.X, v1.Y / v2.Y, v1.Z / v2.Z, v1.W / v2.W); } - public static Vector4 operator /(Vector4 v1, float v2) { - return new Vector4( + + public static Vector4 operator /( Vector4 v1, float v2 ) + { + return new( v1.X / v2, v1.Y / v2, v1.Z / v2, @@ -153,189 +196,216 @@ public Vector4(float x, float y, float z, float w) { } } - internal class Sym3x3 { + internal class Sym3x3 + { private float[] _X = new float[6]; - public float this[int index] { - get { return this._X[index]; } - set { this._X[index] = value; } + + public float this[ int index ] + { + get { return _X[ index ]; } + set { _X[ index ] = value; } } - public Sym3x3() { } - public Sym3x3(float s) { - for (int i = 0; i < 6; ++i) - this._X[i] = s; + public Sym3x3() + { } - public static Sym3x3 ComputeWeightedCovariance(int n, Vector3[] points, float[] weights) { + public Sym3x3( float s ) + { + for( int i = 0; i < 6; ++i ) + _X[ i ] = s; + } + + public static Sym3x3 ComputeWeightedCovariance( int n, Vector3[] points, float[] weights ) + { // Compute the centroid. var total = 0f; - var centroid = new Vector3(0f); - for (int i = 0; i < n; ++i) { - total += weights[i]; - centroid += weights[i] * points[i]; + var centroid = new Vector3( 0f ); + for( int i = 0; i < n; ++i ) + { + total += weights[ i ]; + centroid += weights[ i ] * points[ i ]; } + centroid /= total; // Accumulate the covariance matrix. - var covariance = new Sym3x3(0f); - for (int i = 0; i < n; ++i) { - var a = points[i] - centroid; - var b = weights[i] * a; - - covariance[0] += a.X * b.X; - covariance[1] += a.X * b.Y; - covariance[2] += a.X * b.Z; - covariance[3] += a.Y * b.Y; - covariance[4] += a.Y * b.Z; - covariance[5] += a.Z * b.Z; + var covariance = new Sym3x3( 0f ); + for( int i = 0; i < n; ++i ) + { + var a = points[ i ] - centroid; + var b = weights[ i ] * a; + + covariance[ 0 ] += a.X * b.X; + covariance[ 1 ] += a.X * b.Y; + covariance[ 2 ] += a.X * b.Z; + covariance[ 3 ] += a.Y * b.Y; + covariance[ 4 ] += a.Y * b.Z; + covariance[ 5 ] += a.Z * b.Z; } return covariance; } - private static Vector3 GetMultiplicity1Evector(Sym3x3 matrix, float evalue) { + + private static Vector3 GetMultiplicity1Evector( Sym3x3 matrix, float evalue ) + { // Compute M var m = new Sym3x3(); - m[0] = matrix[0] - evalue; - m[1] = matrix[1]; - m[2] = matrix[2]; - m[3] = matrix[3] - evalue; - m[4] = matrix[4]; - m[5] = matrix[5] - evalue; + m[ 0 ] = matrix[ 0 ] - evalue; + m[ 1 ] = matrix[ 1 ]; + m[ 2 ] = matrix[ 2 ]; + m[ 3 ] = matrix[ 3 ] - evalue; + m[ 4 ] = matrix[ 4 ]; + m[ 5 ] = matrix[ 5 ] - evalue; // Compute U var u = new Sym3x3(); - u[0] = (m[3] * m[5]) - (m[4] * m[4]); - u[1] = (m[2] * m[4]) - (m[1] * m[5]); - u[2] = (m[1] * m[4]) - (m[2] * m[3]); - u[3] = (m[0] * m[5]) - (m[2] * m[2]); - u[4] = (m[1] * m[2]) - (m[4] * m[0]); - u[5] = (m[0] * m[3]) - (m[1] * m[1]); + u[ 0 ] = ( m[ 3 ] * m[ 5 ] ) - ( m[ 4 ] * m[ 4 ] ); + u[ 1 ] = ( m[ 2 ] * m[ 4 ] ) - ( m[ 1 ] * m[ 5 ] ); + u[ 2 ] = ( m[ 1 ] * m[ 4 ] ) - ( m[ 2 ] * m[ 3 ] ); + u[ 3 ] = ( m[ 0 ] * m[ 5 ] ) - ( m[ 2 ] * m[ 2 ] ); + u[ 4 ] = ( m[ 1 ] * m[ 2 ] ) - ( m[ 4 ] * m[ 0 ] ); + u[ 5 ] = ( m[ 0 ] * m[ 3 ] ) - ( m[ 1 ] * m[ 1 ] ); // Find the largest component. - var mc = Math.Abs(u[0]); + var mc = Math.Abs( u[ 0 ] ); var mi = 0; - for (int i = 1; i < 6; ++i) { - var c = Math.Abs(u[i]); - if (c > mc) { + for( int i = 1; i < 6; ++i ) + { + var c = Math.Abs( u[ i ] ); + if( c > mc ) + { mc = c; mi = i; } } // Pick the column with this component. - switch (mi) { + switch( mi ) + { case 0: - return new Vector3(u[0], u[1], u[2]); + return new Vector3( u[ 0 ], u[ 1 ], u[ 2 ] ); case 1: case 3: - return new Vector3(u[1], u[3], u[4]); + return new Vector3( u[ 1 ], u[ 3 ], u[ 4 ] ); default: - return new Vector3(u[2], u[4], u[5]); + return new Vector3( u[ 2 ], u[ 4 ], u[ 5 ] ); } } - private static Vector3 GetMultiplicity2Evector(Sym3x3 matrix, float evalue) { + + private static Vector3 GetMultiplicity2Evector( Sym3x3 matrix, float evalue ) + { // Compute M var m = new Sym3x3(); - m[0] = matrix[0] - evalue; - m[1] = matrix[1]; - m[2] = matrix[2]; - m[3] = matrix[3] - evalue; - m[4] = matrix[4]; - m[5] = matrix[5] - evalue; + m[ 0 ] = matrix[ 0 ] - evalue; + m[ 1 ] = matrix[ 1 ]; + m[ 2 ] = matrix[ 2 ]; + m[ 3 ] = matrix[ 3 ] - evalue; + m[ 4 ] = matrix[ 4 ]; + m[ 5 ] = matrix[ 5 ] - evalue; // Find the largest component. - var mc = Math.Abs(m[0]); + var mc = Math.Abs( m[ 0 ] ); var mi = 0; - for (int i = 1; i < 6; ++i) { - var c = Math.Abs(m[i]); - if (c > mc) { + for( int i = 1; i < 6; ++i ) + { + var c = Math.Abs( m[ i ] ); + if( c > mc ) + { mc = c; mi = i; } } // pick the first eigenvector based on this index - switch (mi) { + switch( mi ) + { case 0: case 1: - return new Vector3(-m[1], m[0], 0.0f); + return new Vector3( -m[ 1 ], m[ 0 ], 0.0f ); case 2: - return new Vector3(m[2], 0.0f, -m[0]); + return new Vector3( m[ 2 ], 0.0f, -m[ 0 ] ); case 3: case 4: - return new Vector3(0.0f, -m[4], m[3]); + return new Vector3( 0.0f, -m[ 4 ], m[ 3 ] ); default: - return new Vector3(0.0f, -m[5], m[4]); + return new Vector3( 0.0f, -m[ 5 ], m[ 4 ] ); } } - public static Vector3 ComputePrincipledComponent(Sym3x3 matrix) { + + public static Vector3 ComputePrincipledComponent( Sym3x3 matrix ) + { // Compute the cubic coefficients var c0 = - (matrix[0] * matrix[3] * matrix[5]) - + (matrix[1] * matrix[2] * matrix[4] * 2f) - - (matrix[0] * matrix[4] * matrix[4]) - - (matrix[3] * matrix[2] * matrix[2]) - - (matrix[5] * matrix[1] * matrix[1]); + ( matrix[ 0 ] * matrix[ 3 ] * matrix[ 5 ] ) + + ( matrix[ 1 ] * matrix[ 2 ] * matrix[ 4 ] * 2f ) + - ( matrix[ 0 ] * matrix[ 4 ] * matrix[ 4 ] ) + - ( matrix[ 3 ] * matrix[ 2 ] * matrix[ 2 ] ) + - ( matrix[ 5 ] * matrix[ 1 ] * matrix[ 1 ] ); var c1 = - (matrix[0] * matrix[3]) - + (matrix[0] * matrix[5]) - + (matrix[3] * matrix[5]) - - (matrix[1] * matrix[1]) - - (matrix[2] * matrix[2]) - - (matrix[4] * matrix[4]); - var c2 = matrix[0] + matrix[3] + matrix[5]; + ( matrix[ 0 ] * matrix[ 3 ] ) + + ( matrix[ 0 ] * matrix[ 5 ] ) + + ( matrix[ 3 ] * matrix[ 5 ] ) + - ( matrix[ 1 ] * matrix[ 1 ] ) + - ( matrix[ 2 ] * matrix[ 2 ] ) + - ( matrix[ 4 ] * matrix[ 4 ] ); + var c2 = matrix[ 0 ] + matrix[ 3 ] + matrix[ 5 ]; // Compute the quadratic coefficients - var a = c1 - ((1f / 3f) * c2 * c2); - var b = ((-2f / 27f) * c2 * c2 * c2) + ((1f / 3f) * c1 * c2) - c0; + var a = c1 - ( ( 1f / 3f ) * c2 * c2 ); + var b = ( ( -2f / 27f ) * c2 * c2 * c2 ) + ( ( 1f / 3f ) * c1 * c2 ) - c0; // Compute the root count check; - var Q = (.25f * b * b) + ((1f / 27f) * a * a * a); + var Q = ( .25f * b * b ) + ( ( 1f / 27f ) * a * a * a ); // Test the multiplicity. - if (float.Epsilon < Q) - return new Vector3(1f); // Only one root, which implies we have a multiple of the identity. - else if (Q < -float.Epsilon) { + if( float.Epsilon < Q ) + return new Vector3( 1f ); // Only one root, which implies we have a multiple of the identity. + else if( Q < -float.Epsilon ) + { // Three distinct roots - var theta = Math.Atan2(Math.Sqrt(Q), -.5f * b); - var rho = Math.Sqrt((.25f * b * b) - Q); + var theta = Math.Atan2( Math.Sqrt( Q ), -.5f * b ); + var rho = Math.Sqrt( ( .25f * b * b ) - Q ); - var rt = Math.Pow(rho, 1f / 3f); - var ct = Math.Cos(theta / 3f); - var st = Math.Sin(theta / 3f); + var rt = Math.Pow( rho, 1f / 3f ); + var ct = Math.Cos( theta / 3f ); + var st = Math.Sin( theta / 3f ); - var l1 = ((1f / 3f) * c2) + (2f * rt * ct); - var l2 = ((1f / 3f) * c2) - (rt * (ct + (Math.Sqrt(3f) * st))); - var l3 = ((1f / 3f) * c2) - (rt * (ct - (Math.Sqrt(3f) * st))); + var l1 = ( ( 1f / 3f ) * c2 ) + ( 2f * rt * ct ); + var l2 = ( ( 1f / 3f ) * c2 ) - ( rt * ( ct + ( Math.Sqrt( 3f ) * st ) ) ); + var l3 = ( ( 1f / 3f ) * c2 ) - ( rt * ( ct - ( Math.Sqrt( 3f ) * st ) ) ); // Pick the larger. - if (Math.Abs(l2) > Math.Abs(l1)) + if( Math.Abs( l2 ) > Math.Abs( l1 ) ) l1 = l2; - if (Math.Abs(l3) > Math.Abs(l1)) + if( Math.Abs( l3 ) > Math.Abs( l1 ) ) l1 = l3; // Get the eigenvector - return GetMultiplicity1Evector(matrix, (float)l1); - } else { // Q very close to 0 + return GetMultiplicity1Evector( matrix, (float)l1 ); + } + else + { + // Q very close to 0 // Two roots double rt; - if (b < 0.0f) - rt = -Math.Pow(-.5f * b, 1f / 3f); + if( b < 0.0f ) + rt = -Math.Pow( -.5f * b, 1f / 3f ); else - rt = Math.Pow(.5f * b, 1f / 3f); + rt = Math.Pow( .5f * b, 1f / 3f ); - var l1 = ((1f / 3f) * c2) + rt; - var l2 = ((1f / 3f) * c2) - (2f * rt); + var l1 = ( ( 1f / 3f ) * c2 ) + rt; + var l2 = ( ( 1f / 3f ) * c2 ) - ( 2f * rt ); // Get the eigenvector - if (Math.Abs(l1) > Math.Abs(l2)) - return GetMultiplicity2Evector(matrix, (float)l1); + if( Math.Abs( l1 ) > Math.Abs( l2 ) ) + return GetMultiplicity2Evector( matrix, (float)l1 ); else - return GetMultiplicity1Evector(matrix, (float)l2); + return GetMultiplicity1Evector( matrix, (float)l2 ); } } } -} +} \ No newline at end of file diff --git a/src/Lumina/Data/Parsing/Uld/NodeData.cs b/src/Lumina/Data/Parsing/Uld/NodeData.cs index d555d744..e5825eb3 100644 --- a/src/Lumina/Data/Parsing/Uld/NodeData.cs +++ b/src/Lumina/Data/Parsing/Uld/NodeData.cs @@ -1,4 +1,3 @@ -using System; using System.IO; // ReSharper disable UnusedMember.Global diff --git a/src/Lumina/Data/Parsing/Uld/UldRoot.cs b/src/Lumina/Data/Parsing/Uld/UldRoot.cs index 9005162e..1826c28f 100644 --- a/src/Lumina/Data/Parsing/Uld/UldRoot.cs +++ b/src/Lumina/Data/Parsing/Uld/UldRoot.cs @@ -1,5 +1,4 @@ using System; -using System.ComponentModel; using System.IO; using System.Linq; using Lumina.Extensions; diff --git a/src/Lumina/Data/Repository.cs b/src/Lumina/Data/Repository.cs index e30cfe77..538ef207 100644 --- a/src/Lumina/Data/Repository.cs +++ b/src/Lumina/Data/Repository.cs @@ -9,7 +9,7 @@ namespace Lumina.Data { public class Repository { - private readonly Lumina _Lumina; + private readonly GameData _gameData; public DirectoryInfo RootDir { get; private set; } /// @@ -48,9 +48,9 @@ public class Repository /// public Dictionary< byte, List< Category > > Categories { get; set; } - internal Repository( DirectoryInfo rootDir, Lumina lumina ) + internal Repository( DirectoryInfo rootDir, GameData gameData ) { - _Lumina = lumina; + _gameData = gameData; RootDir = rootDir; GetExpansionId(); @@ -130,7 +130,7 @@ private void GetExpansionId() } catch( FormatException e ) { - _Lumina.Logger?.Error( + _gameData.Logger?.Error( "failed to parse expansionid, value: {Value} e: {ExceptionMessage}", e.Message ); @@ -191,16 +191,16 @@ private void SetupIndexes() continue; } - var index = new SqPackIndex( file, _Lumina ); + var index = new SqPackIndex( file, _gameData ); var dat = new Category( cat.Value, ExpansionId, chunk, - _Lumina.Options.CurrentPlatform, + _gameData.Options.CurrentPlatform, index, RootDir, - _Lumina ); + _gameData ); catList.Add( dat ); } @@ -218,7 +218,7 @@ private void SetupIndexes() /// Current platform /// /// - public static string BuildDatStr( byte cat, int ex, int chunk, Structs.PlatformId platform, string type ) + public static string BuildDatStr( byte cat, int ex, int chunk, PlatformId platform, string type ) { return $"{cat:x02}{ex:x02}{chunk:x02}.{platform.ToString().ToLowerInvariant()}.{type}"; } @@ -236,7 +236,7 @@ public List< FileInfo > FindIndexes( byte cat, int ex, int chunk ) foreach( var type in new[] { "index", "index2" } ) { - var index = BuildDatStr( cat, ex, chunk, _Lumina.Options.CurrentPlatform, type ); + var index = BuildDatStr( cat, ex, chunk, _gameData.Options.CurrentPlatform, type ); var path = Path.Combine( RootDir.FullName, index ); var fileInfo = new FileInfo( path ); diff --git a/src/Lumina/Data/SqPack.cs b/src/Lumina/Data/SqPack.cs index c51295b1..a83ecf93 100644 --- a/src/Lumina/Data/SqPack.cs +++ b/src/Lumina/Data/SqPack.cs @@ -1,13 +1,9 @@ using System; -using System.Collections.Concurrent; using System.Collections.Generic; -using System.Diagnostics; -using System.Diagnostics.Contracts; using System.IO; -using System.IO.Compression; using System.Reflection; +using Lumina.Data.Attributes; using Lumina.Data.Structs; -using Lumina.Extensions; namespace Lumina.Data { @@ -20,7 +16,7 @@ public SqPackInflateException( string message ) : base( message ) public class SqPack { - private readonly Lumina _Lumina; + private readonly GameData _gameData; /// /// Where the actual file is located on disk @@ -53,17 +49,14 @@ public bool ShouldConvertEndianness protected readonly object CacheLock = new object(); - internal SqPack( FileInfo file, Lumina lumina ) + internal SqPack( FileInfo file, GameData gameData ) { - Contract.Requires( file != null ); - Contract.Requires( file.Exists ); - if( !file.Exists ) { throw new FileNotFoundException( $"SqPack file {file.FullName} could not be found." ); } - _Lumina = lumina; + _gameData = gameData; // always init the cache just in case the should cache setting is changed later FileCache = new Dictionary< long, WeakReference< FileResource > >(); @@ -112,7 +105,7 @@ public T ReadFile< T >( long offset ) where T : FileResource cacheBehaviour = fileOpts.CacheBehaviour; } - if( !_Lumina.Options.CacheFileResources || cacheBehaviour == FileOptionsAttribute.FileCacheBehaviour.Never ) + if( !_gameData.Options.CacheFileResources || cacheBehaviour == FileOptionsAttribute.FileCacheBehaviour.Never ) { using var ss = new SqPackStream( File ); return ss.ReadFile( offset ); diff --git a/src/Lumina/Data/SqPackIndex.cs b/src/Lumina/Data/SqPackIndex.cs index f10ca486..59405a6e 100644 --- a/src/Lumina/Data/SqPackIndex.cs +++ b/src/Lumina/Data/SqPackIndex.cs @@ -1,10 +1,7 @@ -using System; using System.Collections.Generic; -using System.Diagnostics.Contracts; using System.IO; using System.Linq; using System.Runtime.InteropServices; -using System.Threading; using Lumina.Data.Structs; using Lumina.Extensions; @@ -19,7 +16,7 @@ public class SqPackIndex : SqPack public Dictionary< ulong, IndexHashTableEntry > HashTableEntries { get; set; } public Dictionary< uint, Index2HashTableEntry > HashTableEntries2 { get; set; } - internal SqPackIndex( FileInfo indexFile, Lumina lumina ) : base( indexFile, lumina ) + internal SqPackIndex( FileInfo indexFile, GameData gameData ) : base( indexFile, gameData ) { IsIndex2 = indexFile.Extension == ".index2"; diff --git a/src/Lumina/Data/SqPackStream.cs b/src/Lumina/Data/SqPackStream.cs index 6dfe9b04..0abdf461 100644 --- a/src/Lumina/Data/SqPackStream.cs +++ b/src/Lumina/Data/SqPackStream.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using System.Diagnostics; using System.IO; using System.IO.Compression; diff --git a/src/Lumina/Excel/ExcelModule.cs b/src/Lumina/Excel/ExcelModule.cs index e42e22e6..e14ac310 100644 --- a/src/Lumina/Excel/ExcelModule.cs +++ b/src/Lumina/Excel/ExcelModule.cs @@ -1,19 +1,15 @@ using System; -using System.Collections.Concurrent; using System.Collections.Generic; -using System.Diagnostics; using System.Reflection; -using System.Threading.Tasks; using Lumina.Data; using Lumina.Data.Files.Excel; using Lumina.Excel.Exceptions; -using Lumina.Extensions; namespace Lumina.Excel { public class ExcelModule { - private readonly Lumina _lumina; + private readonly GameData _gameData; /// /// Mapping between internal IDs used to index sheets loaded at startup to their name. @@ -32,18 +28,18 @@ public class ExcelModule private readonly object _sheetCreateLock = new object(); - public ExcelModule( Lumina lumina ) + public ExcelModule( GameData gameData ) { - _lumina = lumina; + _gameData = gameData; ImmutableIdToSheetMap = new Dictionary< int, string >(); SheetNames = new List< string >(); _sheetCache = new Dictionary< Tuple< Language, ulong >, ExcelSheetImpl >(); // load all sheet names first - var files = _lumina.GetFile< ExcelListFile >( "exd/root.exl" ); + var files = _gameData.GetFile< ExcelListFile >( "exd/root.exl" ); - _lumina.Logger?.Information("got {ExltEntryCount} exlt entries", files.ExdMap.Count); + _gameData.Logger?.Information("got {ExltEntryCount} exlt entries", files.ExdMap.Count); foreach( var map in files.ExdMap ) { @@ -74,11 +70,11 @@ public static string BuildExcelHeaderPath( string name ) /// /// Attempts to load the base excel sheet given it's implementing row parser /// - /// A class that implements to parse rows + /// A class that implements to parse rows /// An if the sheet exists, null if it does not - public ExcelSheet< T > GetSheet< T >() where T : class, IExcelRow + public ExcelSheet< T > GetSheet< T >() where T : ExcelRow { - return GetSheet< T >( _lumina.Options.DefaultExcelLanguage ); + return GetSheet< T >( _gameData.Options.DefaultExcelLanguage ); } /// @@ -88,9 +84,9 @@ public ExcelSheet< T > GetSheet< T >() where T : class, IExcelRow /// If the language requested doesn't exist for the file, this will silently be ignored and it will return a sheet with the default language: /// /// The requested sheet language - /// A class that implements to parse rows + /// A class that implements to parse rows /// An if the sheet exists, null if it does not - public ExcelSheet< T > GetSheet< T >( Language language ) where T : class, IExcelRow + public ExcelSheet< T > GetSheet< T >( Language language ) where T : ExcelRow { var attr = typeof( T ).GetCustomAttribute< SheetAttribute >(); @@ -108,19 +104,35 @@ public ExcelSheet< T > GetSheet< T >( Language language ) where T : class, IExce /// Useful for when a schema is shared (e.g. in the case of quest text sheets) as redefining loads of classes is wasteful. /// /// The name of a sheet - /// A class that implements to parse rows + /// A class that implements to parse rows /// An if the sheet exists, null if it does not - public ExcelSheet< T > GetSheet< T >( string name ) where T : class, IExcelRow + public ExcelSheet< T > GetSheet< T >( string name ) where T : ExcelRow { - return GetSheet< T >( name, _lumina.Options.DefaultExcelLanguage, null ); + return GetSheet< T >( name, _gameData.Options.DefaultExcelLanguage, null ); } private ulong BuildTypeIdentifier( Type type ) { - return (ulong)type.Assembly.Location.GetHashCode() << 32 | (uint)type.MetadataToken; + return (ulong)type.Assembly.GetHashCode() << 32 | (uint)type.MetadataToken; } - private ExcelSheet< T > GetSheet< T >( string name, Language language, uint? expectedHash ) where T : class, IExcelRow + /// + /// Remove a sheet from the cache completely and free any related resources + /// + /// The sheet type + public void RemoveSheetFromCache< T >() where T : ExcelRow + { + var tid = BuildTypeIdentifier( typeof( T ) ); + + foreach( Language language in Enum.GetValues( typeof( Language ) ) ) + { + var id = Tuple.Create( language, tid ); + + _sheetCache.Remove( id ); + } + } + + private ExcelSheet< T > GetSheet< T >( string name, Language language, uint? expectedHash ) where T : ExcelRow { var tid = BuildTypeIdentifier( typeof( T ) ); var idNoLanguage = Tuple.Create( Language.None, tid ); @@ -153,16 +165,16 @@ private ExcelSheet< T > CreateNewSheet< T >( uint? expectedHash, Tuple< Language, ulong > key, Tuple< Language, ulong > noLangKey - ) where T : class, IExcelRow + ) where T : ExcelRow { - _lumina.Logger?.Debug( + _gameData.Logger?.Debug( "sheet {SheetName} not in cache - creating new sheet for language {Language}", name, language ); var path = BuildExcelHeaderPath( name ); - var headerFile = _lumina.GetFile< ExcelHeaderFile >( path ); + var headerFile = _gameData.GetFile< ExcelHeaderFile >( path ); if( headerFile == null ) { @@ -175,21 +187,21 @@ Tuple< Language, ulong > noLangKey var actualHash = headerFile.GetColumnsHash(); if( actualHash != expectedHash ) { - _lumina.Logger?.Warning( + _gameData.Logger?.Warning( "The sheet impl {SheetImplName} hash doesn't match the hash generated from the header. Expected: {ExpectedHash} actual: {ActualHash}", typeof( T ).FullName, expectedHash, actualHash ); - if( _lumina.Options.PanicOnSheetChecksumMismatch ) + if( _gameData.Options.PanicOnSheetChecksumMismatch ) { throw new ExcelSheetColumnChecksumMismatchException( name, expectedHash.Value, actualHash ); } } } - var newSheet = (ExcelSheet< T >)Activator.CreateInstance( typeof( ExcelSheet< T > ), headerFile, name, language, _lumina ); + var newSheet = (ExcelSheet< T >)Activator.CreateInstance( typeof( ExcelSheet< T > ), headerFile, name, language, _gameData ); newSheet.GenerateFilePages(); var id = key; @@ -216,7 +228,7 @@ Tuple< Language, ulong > noLangKey /// A ExcelSheetImpl object, or null if the sheet name was not found. public ExcelSheetImpl GetSheetRaw( string name ) { - return GetSheetRaw( name, _lumina.Options.DefaultExcelLanguage ); + return GetSheetRaw( name, _gameData.Options.DefaultExcelLanguage ); } /// @@ -232,27 +244,27 @@ public ExcelSheetImpl GetSheetRaw( string name, Language language ) // create new sheet var path = BuildExcelHeaderPath( name ); - var headerFile = _lumina.GetFile< ExcelHeaderFile >( path ); + var headerFile = _gameData.GetFile< ExcelHeaderFile >( path ); if( headerFile == null ) { return null; } - var newSheet = new ExcelSheetImpl( headerFile, name, language, _lumina ); + var newSheet = new ExcelSheetImpl( headerFile, name, language, _gameData ); newSheet.GenerateFilePages(); return newSheet; } /// - /// Checks whether a given decorated with a has a column hash that matches a newly created hash + /// Checks whether a given decorated with a has a column hash that matches a newly created hash /// of the column data from the . /// - /// The to check + /// The to check /// true if the hash matches /// This function will return false if the is missing or a column hash isn't specified in the attribute - public bool SheetHashMatchesColumnDefinition< T >() where T : IExcelRow + public bool SheetHashMatchesColumnDefinition< T >() where T : ExcelRow { var type = typeof( T ); var attr = type.GetCustomAttribute< SheetAttribute >(); @@ -263,7 +275,7 @@ public bool SheetHashMatchesColumnDefinition< T >() where T : IExcelRow } var path = BuildExcelHeaderPath( attr.Name ); - var headerFile = _lumina.GetFile< ExcelHeaderFile >( path ); + var headerFile = _gameData.GetFile< ExcelHeaderFile >( path ); if( headerFile == null ) { diff --git a/src/Lumina/Excel/ExcelRow.cs b/src/Lumina/Excel/ExcelRow.cs new file mode 100644 index 00000000..29b6b0dd --- /dev/null +++ b/src/Lumina/Excel/ExcelRow.cs @@ -0,0 +1,37 @@ +using Lumina.Data; + +namespace Lumina.Excel +{ + public abstract class ExcelRow + { + public uint RowId { get; set; } + public uint SubRowId { get; set; } + + public string SheetName { get; protected set; } + + public Language SheetLanguage { get; set; } + + public virtual void PopulateData( RowParser parser, GameData gameData, Language language ) + { + RowId = parser.Row; + SubRowId = parser.SubRow; + SheetLanguage = language; + + SheetName = parser.Sheet.Name; + } + + /// + /// Implementation shim around what SC calls default columns, allows a sheet impl to provide something more meaningful as a default display value + /// + public virtual object GetDefaultColumnValue() + { + // todo: we can probably just handle subrows in an override instead of doing something funny here because we know statically what are variant 2 sheets + return $"{SheetName}#{RowId}"; + } + + public override string ToString() + { + return $"{SheetName}#{RowId}"; + } + } +} \ No newline at end of file diff --git a/src/Lumina/Excel/ExcelSheet.cs b/src/Lumina/Excel/ExcelSheet.cs index f9e45f67..fb445a0d 100644 --- a/src/Lumina/Excel/ExcelSheet.cs +++ b/src/Lumina/Excel/ExcelSheet.cs @@ -8,12 +8,12 @@ namespace Lumina.Excel { - public class ExcelSheet< T > : ExcelSheetImpl, IEnumerable< T > where T : class, IExcelRow + public class ExcelSheet< T > : ExcelSheetImpl, IEnumerable< T > where T : ExcelRow { private readonly Dictionary< UInt64, T > _rowCache = new Dictionary< UInt64, T >(); - public ExcelSheet( ExcelHeaderFile headerFile, string name, Language requestedLanguage, Lumina lumina ) : - base( headerFile, name, requestedLanguage, lumina ) + public ExcelSheet( ExcelHeaderFile headerFile, string name, Language requestedLanguage, GameData gameData ) : + base( headerFile, name, requestedLanguage, gameData ) { } @@ -43,7 +43,7 @@ internal T GetRowInternal( uint row, uint subRow ) } var rowObj = Activator.CreateInstance< T >(); - rowObj.PopulateData( parser, _Lumina, RequestedLanguage ); + rowObj.PopulateData( parser, GameData, RequestedLanguage ); _rowCache[ cacheKey ] = rowObj; @@ -56,7 +56,7 @@ private T ReadRowObj( RowParser parser, uint rowId ) var obj = Activator.CreateInstance< T >(); - obj.PopulateData( parser, _Lumina, RequestedLanguage ); + obj.PopulateData( parser, GameData, RequestedLanguage ); return obj; } @@ -66,7 +66,7 @@ private T ReadSubRowObj( RowParser parser, uint rowId, uint subRowId ) parser.SeekToRow( rowId, subRowId ); var obj = Activator.CreateInstance< T >(); - obj.PopulateData( parser, _Lumina, RequestedLanguage ); + obj.PopulateData( parser, GameData, RequestedLanguage ); return obj; } diff --git a/src/Lumina/Excel/ExcelSheetImpl.cs b/src/Lumina/Excel/ExcelSheetImpl.cs index 18c4acd3..dd87a9fd 100644 --- a/src/Lumina/Excel/ExcelSheetImpl.cs +++ b/src/Lumina/Excel/ExcelSheetImpl.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using System.Runtime.CompilerServices; using Lumina.Data; using Lumina.Data.Files.Excel; using Lumina.Data.Structs.Excel; @@ -13,13 +12,13 @@ namespace Lumina.Excel { public class ExcelSheetImpl { - internal ExcelSheetImpl( ExcelHeaderFile headerFile, string name, Language requestedLanguage, Lumina lumina ) + internal ExcelSheetImpl( ExcelHeaderFile headerFile, string name, Language requestedLanguage, GameData gameData ) { DataPages = new List< ExcelPage >(); HeaderFile = headerFile; Name = name; RequestedLanguage = requestedLanguage; - _Lumina = lumina; + GameData = gameData; } /// @@ -93,7 +92,7 @@ public Dictionary< ushort, ExcelColumnDefinition > ColumnsByOffset /// public Language RequestedLanguage { get; protected set; } - internal readonly Lumina _Lumina; + internal readonly GameData GameData; /// /// Generates an absolute path to a data file for a sheet @@ -131,7 +130,7 @@ internal void GenerateFilePages() var filePath = GenerateFilePath( Name, bp.StartId, lang ); // ignore languages that don't exist in this client build - if( !_Lumina.FileExists( filePath ) ) + if( !GameData.FileExists( filePath ) ) { continue; } @@ -143,7 +142,7 @@ internal void GenerateFilePages() StartId = bp.StartId }; - segment.File = _Lumina.GetFile< ExcelDataFile >( segment.FilePath ); + segment.File = GameData.GetFile< ExcelDataFile >( segment.FilePath ); // convert big endian to little endian on le systems ProcessDataEndianness( segment.File ); @@ -156,57 +155,57 @@ internal void GenerateFilePages() /// Reverses an inner segment of data based on the column size /// /// The row offset to start from - /// The underlying that contains the file data - /// Used to write the correct data back into the - /// Used to read the correctly sized data from the underlying - protected void ProcessDataRow( long offset, MemoryStream ms, BinaryWriter bw, BinaryReader br ) + /// The underlying file data + protected unsafe void ProcessDataRow( long offset, byte[] fileData ) { foreach( var row in Columns ) { - var type = row.Type; + fixed( byte* ptr = &fileData[ offset + row.Offset ] ) + { + switch( row.Type ) + { + case ExcelColumnDataType.Int16: + case ExcelColumnDataType.UInt16: + { + var pData = (ushort*)ptr; + *pData = BinaryPrimitives.ReverseEndianness( *pData ); - ms.Position = offset + row.Offset; + break; + } + case ExcelColumnDataType.String: + case ExcelColumnDataType.Int32: + case ExcelColumnDataType.UInt32: + case ExcelColumnDataType.Float32: + { + var pData = (uint*)ptr; + *pData = BinaryPrimitives.ReverseEndianness( *pData ); - byte[] data; + break; + } + case ExcelColumnDataType.Int64: + case ExcelColumnDataType.UInt64: + { + var pData = (ulong*)ptr; + *pData = BinaryPrimitives.ReverseEndianness( *pData ); + break; + } - switch( type ) - { - case ExcelColumnDataType.Int16: - case ExcelColumnDataType.UInt16: - { - data = br.ReadBytes( Unsafe.SizeOf< UInt16 >() ); - break; - } - case ExcelColumnDataType.String: - case ExcelColumnDataType.Int32: - case ExcelColumnDataType.UInt32: - case ExcelColumnDataType.Float32: - { - data = br.ReadBytes( Unsafe.SizeOf< UInt32 >() ); - break; - } - case ExcelColumnDataType.Int64: - case ExcelColumnDataType.UInt64: - { - data = br.ReadBytes( Unsafe.SizeOf< UInt64 >() ); - break; + default: + continue; } - - default: - continue; } // not really sure why but this sometimes happens, but it'll read 0 bytes and then try and write it to the end // and crash because it's attempting to alloc memory for some retarded reason, makes 0 sense to me // todo: figure out why (item sheet, maybe quest?) // todo: potentially fixed by accident but don't want to remove - if( data.Length == 0 ) - continue; + // if( data.Length == 0 ) + // continue; - Array.Reverse( data ); + // Array.Reverse( data ); - ms.Position -= data.Length; - bw.Write( data ); + // ms.Position -= data.Length; + // bw.Write( data ); } } @@ -227,9 +226,8 @@ protected void ProcessDataEndianness( ExcelDataFile file ) return; } - + // todo: clean this shit up too var stream = new MemoryStream( file.Data ); - var writer = new BinaryWriter( stream ); var reader = new BinaryReader( stream ); foreach( var row in file.RowData.Values ) @@ -250,13 +248,13 @@ protected void ProcessDataEndianness( ExcelDataFile file ) stream.Position = subRowOffset; - ProcessDataRow( subRowOffset, stream, writer, reader ); + ProcessDataRow( subRowOffset, file.Data ); } } else { - // skip header - ProcessDataRow( offset + 6, stream, writer, reader ); + // skip (unused) header + ProcessDataRow( offset + 6, file.Data ); } } diff --git a/src/Lumina/Excel/IExcelRow.cs b/src/Lumina/Excel/IExcelRow.cs deleted file mode 100644 index ccc32c10..00000000 --- a/src/Lumina/Excel/IExcelRow.cs +++ /dev/null @@ -1,18 +0,0 @@ -using Lumina.Data; - -namespace Lumina.Excel -{ - public interface IExcelRow - { - uint RowId { get; set; } - uint SubRowId { get; set; } - - /// - /// Used to populate data in implementing classes - /// - /// The parser instance which provides access to row data - /// The lumina instance responsible for creating the sheet - /// The requested language for the row - void PopulateData( RowParser parser, Lumina lumina, Language language ); - } -} \ No newline at end of file diff --git a/src/Lumina/Excel/LazyRow.cs b/src/Lumina/Excel/LazyRow.cs index 8bd17419..109bd1e7 100644 --- a/src/Lumina/Excel/LazyRow.cs +++ b/src/Lumina/Excel/LazyRow.cs @@ -3,13 +3,33 @@ namespace Lumina.Excel { + public interface ILazyRow + { + /// + /// The backing value/row that was passed through when creating the reference + /// + public uint Row { get; } + + /// + /// Checks whether something has loaded successfully. + /// + /// + /// If something fails to load, this will still be false regardless. + /// + public bool IsValueCreated { get; } + + public Language Language { get; } + + public ExcelRow RawRow { get; } + } + /// /// Allows for sheet definitions to contain entries which will lazily load the referenced sheet row /// /// The row type to load - public class LazyRow< T > where T : class, IExcelRow + public class LazyRow< T > : ILazyRow where T : ExcelRow { - private readonly Lumina _lumina; + private readonly GameData _gameData; private readonly uint _row; private readonly Language _language; @@ -20,15 +40,17 @@ public class LazyRow< T > where T : class, IExcelRow /// public uint Row => _row; + public Language Language => _language; + /// /// Construct a new LazyRow instance /// - /// The Lumina instance to load from + /// The Lumina instance to load from /// The row id to load if/when the value is fetched /// The requested language to use when resolving row references - public LazyRow( Lumina lumina, uint row, Language language = Language.None ) + public LazyRow( GameData gameData, uint row, Language language = Language.None ) { - _lumina = lumina; + _gameData = gameData; _row = row; _language = language; } @@ -36,9 +58,9 @@ public LazyRow( Lumina lumina, uint row, Language language = Language.None ) /// /// Construct a new LazyRow instance /// - /// The Lumina instance to load from + /// The Lumina instance to load from /// The row id to load if/when the value is fetched - public LazyRow( Lumina lumina, int row, Language language = Language.None ) : this( lumina, (uint)row, language ) + public LazyRow( GameData gameData, int row, Language language = Language.None ) : this( gameData, (uint)row, language ) { } @@ -54,12 +76,17 @@ public T Value return _value; } - _value = _lumina.GetExcelSheet< T >( _language ).GetRow( _row ); + _value = _gameData.GetExcelSheet< T >( _language ).GetRow( _row ); return _value; } } + /// + /// Provides access to the raw row without any fuckery, useful for serialisation and etc. + /// + public ExcelRow RawRow => Value; + /// /// Checks whether something has loaded successfully. /// diff --git a/src/Lumina/Excel/RowParser.cs b/src/Lumina/Excel/RowParser.cs index 201e8a7b..50096e37 100644 --- a/src/Lumina/Excel/RowParser.cs +++ b/src/Lumina/Excel/RowParser.cs @@ -2,7 +2,6 @@ using System.Buffers.Binary; using System.Collections.Generic; using System.IO; -using System.Linq; using System.Runtime.CompilerServices; using Lumina.Data.Files.Excel; using Lumina.Data.Structs.Excel; @@ -27,6 +26,11 @@ public class RowParser private MemoryStream Stream => _dataFile.FileStream; + /// + /// Provides access to the base data generated for a sheet + /// + public ExcelSheetImpl Sheet => _sheet; + public RowParser( ExcelSheetImpl sheet, ExcelDataFile dataFile ) { _sheet = sheet; @@ -306,7 +310,7 @@ private T ReadField< T >( ExcelColumnDataType type ) { var data = ReadFieldInternal( type ); - if( _sheet._Lumina.Options.ExcelSheetStrictCastingEnabled ) + if( _sheet.GameData.Options.ExcelSheetStrictCastingEnabled ) { return (T)data; } diff --git a/src/Lumina/Extensions/BinaryReaderExtensions.cs b/src/Lumina/Extensions/BinaryReaderExtensions.cs index 3993b62e..6301e91f 100644 --- a/src/Lumina/Extensions/BinaryReaderExtensions.cs +++ b/src/Lumina/Extensions/BinaryReaderExtensions.cs @@ -1,12 +1,12 @@ using System; using System.Collections.Generic; -using System.Diagnostics; using System.IO; -using System.Linq; +using System.Linq.Expressions; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Text; using Lumina.Data.Parsing; +// ReSharper disable RedundantAssignment namespace Lumina.Extensions { @@ -124,6 +124,83 @@ public static StringOffset ReadStringOffset( this BinaryReader br, long offset ) return new StringOffset( br, offset ); } + public static BinaryReader ReadStringOffset( this BinaryReader br, long offset, ref string value ) + { + value = new StringOffset( br, offset ); + + return br; + } + + public static BinaryReader ReadStringOffset( this BinaryReader br, long offset, ref StringOffset value ) + { + value = new StringOffset( br, offset ); + + return br; + } + + public static BinaryReader Read( this BinaryReader br, ref ulong field ) + { + field = br.ReadUInt64(); + + return br; + } + + public static BinaryReader Read( this BinaryReader br, ref long field ) + { + field = br.ReadInt64(); + + return br; + } + + public static BinaryReader Read( this BinaryReader br, ref uint field ) + { + field = br.ReadUInt32(); + + return br; + } + + public static BinaryReader Read( this BinaryReader br, ref int field ) + { + field = br.ReadInt32(); + + return br; + } + + public static BinaryReader Read( this BinaryReader br, ref ushort field ) + { + field = br.ReadUInt16(); + + return br; + } + + public static BinaryReader Read( this BinaryReader br, ref short field ) + { + field = br.ReadInt16(); + + return br; + } + + public static BinaryReader Read( this BinaryReader br, ref byte field ) + { + field = br.ReadByte(); + + return br; + } + + public static BinaryReader Read( this BinaryReader br, ref float field ) + { + field = br.ReadSingle(); + + return br; + } + + public static BinaryReader Read( this BinaryReader br, ref double field ) + { + field = br.ReadDouble(); + + return br; + } + /// /// Reads a byte and moves the stream position back to where it started before the operation /// diff --git a/src/Lumina/Extensions/HalfExtensions.cs b/src/Lumina/Extensions/HalfExtensions.cs index 702c5061..096e152f 100644 --- a/src/Lumina/Extensions/HalfExtensions.cs +++ b/src/Lumina/Extensions/HalfExtensions.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; namespace Lumina.Extensions { diff --git a/src/Lumina/Extensions/LuminaExtensions.cs b/src/Lumina/Extensions/LuminaExtensions.cs index 11b00a2f..b31b41ca 100644 --- a/src/Lumina/Extensions/LuminaExtensions.cs +++ b/src/Lumina/Extensions/LuminaExtensions.cs @@ -4,11 +4,11 @@ namespace Lumina.Extensions { public static class LuminaExtensions { - public static TexFile GetIcon( this Lumina lumina, int iconId ) + public static TexFile GetIcon( this GameData gameData, int iconId ) { var path = $"ui/icon/{iconId / 1000 * 1000:000000}/{iconId:000000}.tex"; - return lumina.GetFile< TexFile >( path ); + return gameData.GetFile< TexFile >( path ); } } } \ No newline at end of file diff --git a/src/Lumina/Extensions/SpanExtensions.cs b/src/Lumina/Extensions/SpanExtensions.cs index 3a31f639..c0f71ac0 100644 --- a/src/Lumina/Extensions/SpanExtensions.cs +++ b/src/Lumina/Extensions/SpanExtensions.cs @@ -1,5 +1,4 @@ using System; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; namespace Lumina.Extensions diff --git a/src/Lumina/Lumina.cs b/src/Lumina/GameData.cs similarity index 96% rename from src/Lumina/Lumina.cs rename to src/Lumina/GameData.cs index f7fb466d..edc73221 100644 --- a/src/Lumina/Lumina.cs +++ b/src/Lumina/GameData.cs @@ -11,7 +11,7 @@ namespace Lumina { - public class Lumina + public class GameData { /// /// The current data path that Lumina is using to load files. @@ -56,7 +56,7 @@ public class Lumina /// Path to the sqpack directory /// Options object to provide additional configuration /// Thrown when the sqpack directory supplied is missing. - public Lumina( string dataPath, LuminaOptions options = null ) + public GameData( string dataPath, LuminaOptions options = null ) { Options = options ?? new LuminaOptions(); @@ -89,7 +89,7 @@ public Lumina( string dataPath, LuminaOptions options = null ) /// An implementation that Lumina can send log events to /// Options object to provide additional configuration /// Thrown when the sqpack directory supplied is missing. - public Lumina( string dataPath, ILogger logger, LuminaOptions options = null ) : this(dataPath, options) + public GameData( string dataPath, ILogger logger, LuminaOptions options = null ) : this(dataPath, options) { Logger = logger ?? throw new ArgumentNullException( nameof( logger ) ); } @@ -248,9 +248,9 @@ public static UInt64 GetFileHash( string path ) /// /// Attempts to load the base excel sheet given it's implementing row parser /// - /// A class that implements to parse rows + /// A class that implements to parse rows /// An if the sheet exists, null if it does not - public ExcelSheet< T > GetExcelSheet< T >() where T : class, IExcelRow + public ExcelSheet< T > GetExcelSheet< T >() where T : ExcelRow { return Excel.GetSheet< T >(); } @@ -262,9 +262,9 @@ public ExcelSheet< T > GetExcelSheet< T >() where T : class, IExcelRow /// If the language requested doesn't exist for the file, this will silently be ignored and it will return a sheet with the default language: /// /// The requested sheet language - /// A class that implements to parse rows + /// A class that implements to parse rows /// An if the sheet exists, null if it does not - public ExcelSheet< T > GetExcelSheet< T >( Language language ) where T : class, IExcelRow + public ExcelSheet< T > GetExcelSheet< T >( Language language ) where T : ExcelRow { return Excel.GetSheet< T >( language ); } diff --git a/src/Lumina/ParsedFilePath.cs b/src/Lumina/ParsedFilePath.cs index e43cc1df..6dcd0cc8 100644 --- a/src/Lumina/ParsedFilePath.cs +++ b/src/Lumina/ParsedFilePath.cs @@ -1,5 +1,3 @@ -using Lumina.Data; - namespace Lumina { public class ParsedFilePath diff --git a/src/Lumina/Text/Payloads/BasePayload.cs b/src/Lumina/Text/Payloads/BasePayload.cs new file mode 100644 index 00000000..e012e7a3 --- /dev/null +++ b/src/Lumina/Text/Payloads/BasePayload.cs @@ -0,0 +1,62 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Text; + +namespace Lumina.Text.Payloads +{ + public class BasePayload + { + public BasePayload() + { + + } + + public BasePayload( byte[] data ) + { + _data = data; + _rawString = Encoding.UTF8.GetString( data ); + } + + public BasePayload( BinaryReader br ) + { + var data = GetPayloadData( br ); + + if( data.Any() ) + { + _rawString = Encoding.UTF8.GetString( data ); + } + } + + public byte[] GetPayloadData( BinaryReader br ) + { + var data = new List< byte >(); + + while( br.BaseStream.Position < br.BaseStream.Length ) + { + var d = br.ReadByte(); + data.Add( d ); + if( d == SeString.EndByte ) + { + // data.Add( d ); + // br.BaseStream.Position++; + break; + } + } + + return data.ToArray(); + } + + #if DEBUG + public string PayloadType => GetType().FullName; + #endif + + protected byte[] _data; + protected string _rawString; + + public ReadOnlySpan< byte > Data => _data.AsSpan(); + public string RawString => _rawString; + + } +} \ No newline at end of file diff --git a/src/Lumina/Text/Payloads/TextPayload.cs b/src/Lumina/Text/Payloads/TextPayload.cs new file mode 100644 index 00000000..b48651bd --- /dev/null +++ b/src/Lumina/Text/Payloads/TextPayload.cs @@ -0,0 +1,40 @@ +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Text; +using Lumina.Extensions; + +namespace Lumina.Text.Payloads +{ + public class TextPayload : BasePayload + { + public TextPayload( BinaryReader br ) + { + var data = new List< byte >(); + + while( br.BaseStream.Position < br.BaseStream.Length ) + { + var d = br.PeekByte(); + if( d != SeString.StartByte ) + { + data.Add( d ); + br.BaseStream.Position++; + } + else + { + break; + } + } + + if( !data.Any() ) + { + return; + } + + var arr = data.ToArray(); + + _rawString = Encoding.UTF8.GetString( arr ); + _data = arr; + } + } +} \ No newline at end of file diff --git a/src/Lumina/Text/SeString.cs b/src/Lumina/Text/SeString.cs index 2be614ff..0e2892b9 100644 --- a/src/Lumina/Text/SeString.cs +++ b/src/Lumina/Text/SeString.cs @@ -1,28 +1,124 @@ using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; using System.Text; +using Lumina.Extensions; +using Lumina.Text.Payloads; namespace Lumina.Text { public class SeString { + public const byte StartByte = 0x02; + public const byte EndByte = 0x03; + public SeString( byte[] data ) { _rawData = data; _rawReadable = Encoding.UTF8.GetString( data ); + + _payloads = BuildPayloads(); } - private byte[] _rawData; + public SeString( string data ) + { + _rawReadable = data; + _rawData = Encoding.UTF8.GetBytes( data ); + + _payloads = BuildPayloads(); + } - private readonly string _rawReadable; + public SeString( List< BasePayload > payloads ) + { + _payloads = payloads; + } + + private byte[] _rawData; + private string _rawReadable; public ReadOnlySpan< byte > RawData => _rawData.AsSpan(); - public string RawString => _rawReadable; - public static implicit operator string( SeString str ) => str._rawReadable; + public string RawString + { + get + { + if( _rawReadable == null ) + { + // build a readable string + _rawReadable = string.Concat( _payloads.Select( x => x.RawString ) ); + } + + return _rawReadable; + } + } + + private List< BasePayload > _payloads { get; set; } + public IReadOnlyList< BasePayload > Payloads => _payloads; + + private List< BasePayload > BuildPayloads() + { + var payloads = new List< BasePayload >(); + + using var ms = new MemoryStream( _rawData ); + using var br = new BinaryReader( ms ); + + var start = ms.Position; + + while( ms.Position < _rawData.Length ) + { + var marker = br.PeekByte(); + if( marker != StartByte ) + { + payloads.Add( new TextPayload( br ) ); + } + else + { + payloads.Add( new BasePayload( br ) ); + } + } + + return payloads; + } + + public static implicit operator string( SeString str ) => str.RawString; + + public static SeString operator +( SeString lhs, SeString rhs ) + { + return null; + } + + public static bool operator ==( SeString lhs, SeString rhs ) + { + return false; + } + + public static bool operator !=( SeString lhs, SeString rhs ) + { + return !( lhs == rhs ); + } + + protected bool Equals( SeString other ) + { + throw new NotImplementedException(); + } + + public override bool Equals( object obj ) + { + if( ReferenceEquals( null, obj ) ) return false; + if( ReferenceEquals( this, obj ) ) return true; + if( obj.GetType() != this.GetType() ) return false; + return Equals( (SeString)obj ); + } + + public override int GetHashCode() + { + throw new NotImplementedException(); + } public override string ToString() { - return _rawReadable; + return RawString; } } } \ No newline at end of file