Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Dat/FileParsing/SawyerStreamWriter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
using Definitions.ObjectModels.Graphics;
using Definitions.ObjectModels.Objects.Sound;
using Definitions.ObjectModels.Types;
using System.Collections.Immutable;
using System.ComponentModel.DataAnnotations;
using System.Text;

Expand Down
52 changes: 51 additions & 1 deletion DataSanitiser/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,56 @@ static ObjectType TypeToStruct(Type type)
_ => throw new ArgumentOutOfRangeException(nameof(type), $"unknown struct type {type.FullName}")
};

static void QueryBuildingVar_AC()
{
var dir = "Q:\\Steam\\steamapps\\common\\Locomotion\\ObjData";
var logger = new Logger();
var index = ObjectIndex.LoadOrCreateIndex(dir, logger);

var results = new List<(ObjectIndexEntry Obj, int var_ac)>();

foreach (var obj in index.Objects.Where(x => x.ObjectType == ObjectType.Building))
{
try
{
var o = SawyerStreamReader.LoadFullObject(Path.Combine(dir, obj.FileName), logger);
if (o.LocoObject != null)
{
var struc = (BuildingObject)o.LocoObject.Object;
var header = o.DatFileInfo.S5Header;
var source = OriginalObjectFiles.GetFileSource(header.Name, header.Checksum, header.ObjectSource);

if (source != ObjectSource.LocomotionSteam)
{
continue;
}

results.Add((obj, struc.var_AC));
}
}
catch (Exception ex)
{
Console.WriteLine($"{obj.FileName} - {ex.Message}");
}
}

Console.WriteLine(results.Count);

const string csvHeader = "DatName, Var_AC";
var lines = results
.OrderByDescending(x => x.var_ac)
.Select(x => string.Join(',', x.Obj.DisplayName, x.var_ac));

File.WriteAllLines("building_var_ac.csv", [csvHeader, .. lines]);

//foreach (var line in lines)
//{
// Console.WriteLine(line);
//}
}

QueryBuildingVar_AC();

static void QueryBuildingProducedQuantity()
{
var dir = "Q:\\Steam\\steamapps\\common\\Locomotion\\ObjData";
Expand Down Expand Up @@ -130,7 +180,7 @@ static void QueryBuildingProducedQuantity()
// Console.WriteLine(line);
//}
}
QueryBuildingProducedQuantity();
//QueryBuildingProducedQuantity();

static void QueryHeadquarters()
{
Expand Down
270 changes: 135 additions & 135 deletions Definitions/Migrations/20251228122835_AddTblObjectMissing.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,146 +10,146 @@ public partial class AddTblObjectMissing : Migration
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.RenameColumn(
name: "ShipWakeOffset",
table: "ObjVehicle",
newName: "ShipWakeSpacing");

migrationBuilder.RenameColumn(
name: "Clearance",
table: "ObjTree",
newName: "var_05");

migrationBuilder.RenameColumn(
name: "DisplayOffset",
table: "ObjTrack",
newName: "VehicleDisplayListVerticalOffset");

migrationBuilder.RenameColumn(
name: "DisplayOffset",
table: "ObjRoad",
newName: "VehicleDisplayListVerticalOffset");

migrationBuilder.RenameColumn(
name: "WindowPlayerColor",
table: "ObjInterface",
newName: "WindowPlayerColour");

migrationBuilder.RenameColumn(
name: "Flags",
table: "ObjHillShapes",
newName: "IsHeightMap");

migrationBuilder.RenameColumn(
name: "MaxPremiumRate",
table: "ObjCargo",
newName: "NonPremiumRate");

migrationBuilder.RenameColumn(
name: "AllowedPlaneTypes",
table: "ObjAirport",
newName: "Flags");

migrationBuilder.AddColumn<byte>(
name: "InitialHeight",
table: "ObjTree",
type: "INTEGER",
nullable: false,
defaultValue: (byte)0);

migrationBuilder.AddColumn<byte>(
name: "SeasonalVariants",
table: "ObjTree",
type: "INTEGER",
nullable: false,
defaultValue: (byte)0);

migrationBuilder.AddColumn<byte>(
name: "var_04",
table: "ObjTree",
type: "INTEGER",
nullable: false,
defaultValue: (byte)0);

migrationBuilder.CreateTable(
name: "ObjectsMissing",
columns: table => new
{
Id = table.Column<ulong>(type: "INTEGER", nullable: false)
.Annotation("Sqlite:Autoincrement", true),
DatName = table.Column<string>(type: "TEXT", nullable: false),
DatChecksum = table.Column<uint>(type: "INTEGER", nullable: false),
ObjectType = table.Column<byte>(type: "INTEGER", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_ObjectsMissing", x => x.Id);
});

migrationBuilder.CreateIndex(
name: "IX_ObjectsMissing_DatName_DatChecksum",
table: "ObjectsMissing",
columns: new[] { "DatName", "DatChecksum" },
unique: true);
_ = migrationBuilder.RenameColumn(
name: "ShipWakeOffset",
table: "ObjVehicle",
newName: "ShipWakeSpacing");

_ = migrationBuilder.RenameColumn(
name: "Clearance",
table: "ObjTree",
newName: "var_05");

_ = migrationBuilder.RenameColumn(
name: "DisplayOffset",
table: "ObjTrack",
newName: "VehicleDisplayListVerticalOffset");

_ = migrationBuilder.RenameColumn(
name: "DisplayOffset",
table: "ObjRoad",
newName: "VehicleDisplayListVerticalOffset");

_ = migrationBuilder.RenameColumn(
name: "WindowPlayerColor",
table: "ObjInterface",
newName: "WindowPlayerColour");

_ = migrationBuilder.RenameColumn(
name: "Flags",
table: "ObjHillShapes",
newName: "IsHeightMap");

_ = migrationBuilder.RenameColumn(
name: "MaxPremiumRate",
table: "ObjCargo",
newName: "NonPremiumRate");

_ = migrationBuilder.RenameColumn(
name: "AllowedPlaneTypes",
table: "ObjAirport",
newName: "Flags");

_ = migrationBuilder.AddColumn<byte>(
name: "InitialHeight",
table: "ObjTree",
type: "INTEGER",
nullable: false,
defaultValue: (byte)0);

_ = migrationBuilder.AddColumn<byte>(
name: "SeasonalVariants",
table: "ObjTree",
type: "INTEGER",
nullable: false,
defaultValue: (byte)0);

_ = migrationBuilder.AddColumn<byte>(
name: "var_04",
table: "ObjTree",
type: "INTEGER",
nullable: false,
defaultValue: (byte)0);

_ = migrationBuilder.CreateTable(
name: "ObjectsMissing",
columns: table => new
{
Id = table.Column<ulong>(type: "INTEGER", nullable: false)
.Annotation("Sqlite:Autoincrement", true),
DatName = table.Column<string>(type: "TEXT", nullable: false),
DatChecksum = table.Column<uint>(type: "INTEGER", nullable: false),
ObjectType = table.Column<byte>(type: "INTEGER", nullable: false)
},
constraints: table =>
{
_ = table.PrimaryKey("PK_ObjectsMissing", x => x.Id);
});

_ = migrationBuilder.CreateIndex(
name: "IX_ObjectsMissing_DatName_DatChecksum",
table: "ObjectsMissing",
columns: new[] { "DatName", "DatChecksum" },
unique: true);
}

/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "ObjectsMissing");

migrationBuilder.DropColumn(
name: "InitialHeight",
table: "ObjTree");

migrationBuilder.DropColumn(
name: "SeasonalVariants",
table: "ObjTree");

migrationBuilder.DropColumn(
name: "var_04",
table: "ObjTree");

migrationBuilder.RenameColumn(
name: "ShipWakeSpacing",
table: "ObjVehicle",
newName: "ShipWakeOffset");

migrationBuilder.RenameColumn(
name: "var_05",
table: "ObjTree",
newName: "Clearance");

migrationBuilder.RenameColumn(
name: "VehicleDisplayListVerticalOffset",
table: "ObjTrack",
newName: "DisplayOffset");

migrationBuilder.RenameColumn(
name: "VehicleDisplayListVerticalOffset",
table: "ObjRoad",
newName: "DisplayOffset");

migrationBuilder.RenameColumn(
name: "WindowPlayerColour",
table: "ObjInterface",
newName: "WindowPlayerColor");

migrationBuilder.RenameColumn(
name: "IsHeightMap",
table: "ObjHillShapes",
newName: "Flags");

migrationBuilder.RenameColumn(
name: "NonPremiumRate",
table: "ObjCargo",
newName: "MaxPremiumRate");

migrationBuilder.RenameColumn(
name: "Flags",
table: "ObjAirport",
newName: "AllowedPlaneTypes");
_ = migrationBuilder.DropTable(
name: "ObjectsMissing");

_ = migrationBuilder.DropColumn(
name: "InitialHeight",
table: "ObjTree");

_ = migrationBuilder.DropColumn(
name: "SeasonalVariants",
table: "ObjTree");

_ = migrationBuilder.DropColumn(
name: "var_04",
table: "ObjTree");

_ = migrationBuilder.RenameColumn(
name: "ShipWakeSpacing",
table: "ObjVehicle",
newName: "ShipWakeOffset");

_ = migrationBuilder.RenameColumn(
name: "var_05",
table: "ObjTree",
newName: "Clearance");

_ = migrationBuilder.RenameColumn(
name: "VehicleDisplayListVerticalOffset",
table: "ObjTrack",
newName: "DisplayOffset");

_ = migrationBuilder.RenameColumn(
name: "VehicleDisplayListVerticalOffset",
table: "ObjRoad",
newName: "DisplayOffset");

_ = migrationBuilder.RenameColumn(
name: "WindowPlayerColour",
table: "ObjInterface",
newName: "WindowPlayerColor");

_ = migrationBuilder.RenameColumn(
name: "IsHeightMap",
table: "ObjHillShapes",
newName: "Flags");

_ = migrationBuilder.RenameColumn(
name: "NonPremiumRate",
table: "ObjCargo",
newName: "MaxPremiumRate");

_ = migrationBuilder.RenameColumn(
name: "Flags",
table: "ObjAirport",
newName: "AllowedPlaneTypes");
}
}
}
1 change: 1 addition & 0 deletions Definitions/ObjectModels/Graphics/ImageTable.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ public PaletteMap PaletteMap
{
throw new Exception("Failed to convert image");
}

ge.Image = image;
}
}
Expand Down
1 change: 1 addition & 0 deletions Definitions/ObjectModels/Graphics/ImageTableHelpers.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ private static Image<Rgba32> CreateErrorImage()
img[x, y] = isRed ? Color.Magenta : Color.White;
}
}

return img;
}

Expand Down
7 changes: 5 additions & 2 deletions Gui/App.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -108,19 +108,22 @@
<DataTemplate DataType="vm:ObjectMetadataViewModel">
<vi:MetadataView />
</DataTemplate>
<DataTemplate DataType="vm:StringTableViewModel">
<vi:StringTableView />
</DataTemplate>
<DataTemplate DataType="vm:ObjectEditorViewModel">
<vi:ObjectEditorView />
</DataTemplate>
<DataTemplate DataType="vm:FolderTreeViewModel">
<vi:FolderTreeView />
</DataTemplate>
<DataTemplate DataType="vm:LocoTypes.Objects.Building.BuildingComponentsViewModel">
<DataTemplate DataType="vm:Loco.Objects.Building.BuildingComponentsViewModel">
<vi:BuildingComponentsView />
</DataTemplate>
<DataTemplate DataType="vm:G1ViewModel">
<ContentControl Content="{Binding ImageTableViewModel}" />
</DataTemplate>
<DataTemplate DataType="vm:IObjectViewModel">
<DataTemplate DataType="vm:IViewModel">
<ScrollViewer>
<vi:ExtendedPropertyGrid Background="{DynamicResource ExpanderContentBackground}" IsHeaderVisible="True" IsCategoryVisible="False" IsAutoNameWidth="True" IsQuickFilterVisible="True" DataContext="{Binding}" />
</ScrollViewer>
Expand Down
Loading