epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move TileSize definition to terrain info.

Browse Source
This commit is contained in:
Paul Chote
2025-03-29 19:15:56 +00:00
committed by Gustas Kažukauskas
parent 0f7b24a8c0
commit 25188e849e
24 changed files with 48 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenRA.Mods.Cnc/UtilityCommands/LegacySequenceImporter.cs
View File

@@ -13,6 +13,7 @@ using System;
using System.IO;
using System.Linq;
using OpenRA.Mods.Common.FileFormats;
using OpenRA.Primitives;
namespace OpenRA.Mods.Cnc.UtilityCommands
{
@@ -26,16 +27,14 @@ namespace OpenRA.Mods.Cnc.UtilityCommands
string IUtilityCommand.Name => "--sequence-import";
IniFile file;
MapGrid grid;
Size tileSize;
[Desc("FILENAME", "Convert ART.INI to the OpenRA sequence definition format.")]
void IUtilityCommand.Run(Utility utility, string[] args)
{
// HACK: The engine code assumes that Game.modData is set.
Game.ModData = utility.ModData;
grid = Game.ModData.Manifest.Get<MapGrid>();
tileSize = Game.ModData.DefaultTerrainInfo.Values.First().TileSize;
file = new IniFile(File.Open(args[1], FileMode.Open));
foreach (var section in file.Sections)
@@ -65,8 +64,8 @@ namespace OpenRA.Mods.Cnc.UtilityCommands
var x = Exts.ParseInt32Invariant(size[0]);
var y = Exts.ParseInt32Invariant(size[1]);
var xOffset = (x - y) * grid.TileSize.Width / 4;
var yOffset = (x + y) * grid.TileSize.Height / 4;
var xOffset = (x - y) * tileSize.Width / 4;
var yOffset = (x + y) * tileSize.Height / 4;
Console.WriteLine("\t\tOffset: {0},{1}", -xOffset, -yOffset);
}
}

2
OpenRA.Mods.Cnc/UtilityCommands/LegacyTilesetImporter.cs
View File

@@ -36,7 +36,7 @@ namespace OpenRA.Mods.Cnc.UtilityCommands
var file = new IniFile(File.Open(args[1], FileMode.Open));
var extension = args[2];
var tileSize = utility.ModData.Manifest.Get<MapGrid>().TileSize;
var tileSize = utility.ModData.DefaultTerrainInfo.Values.First().TileSize;
var templateIndex = 0;