diff --git a/src/Syroot.Worms.UnitTest/Gen2/ImageTests.cs b/src/Syroot.Worms.UnitTest/Gen2/ImageTests.cs
index fc60d2d..8d50326 100644
--- a/src/Syroot.Worms.UnitTest/Gen2/ImageTests.cs
+++ b/src/Syroot.Worms.UnitTest/Gen2/ImageTests.cs
@@ -5,7 +5,7 @@ using Syroot.Worms.UnitTest.Common;
namespace Syroot.Worms.UnitTest.Gen2
{
///
- /// Represents a collection of tests for the class.
+ /// Represents a collection of tests for the class.
///
[TestCategory("Gen2")]
[TestClass]
@@ -19,7 +19,7 @@ namespace Syroot.Worms.UnitTest.Gen2
[TestMethod]
public void LoadImages()
{
- TestHelpers.LoadFiles(Game.All, "*.img");
+ TestHelpers.LoadFiles(Game.All, "*.img");
}
}
}
diff --git a/src/Syroot.Worms/ImageData.cs b/src/Syroot.Worms/BitmapData.cs
similarity index 97%
rename from src/Syroot.Worms/ImageData.cs
rename to src/Syroot.Worms/BitmapData.cs
index 4b262ff..f2ff296 100644
--- a/src/Syroot.Worms/ImageData.cs
+++ b/src/Syroot.Worms/BitmapData.cs
@@ -5,7 +5,7 @@ namespace Syroot.Worms
///
/// Represents a pixel-based 2D image in different color formats.
///
- public class ImageData
+ public class BitmapData
{
// ---- PROPERTIES ---------------------------------------------------------------------------------------------
diff --git a/src/Syroot.Worms/Gen2/Armageddon/LandData.cs b/src/Syroot.Worms/Gen2/Armageddon/LandData.cs
index bd749f3..1af97b0 100644
--- a/src/Syroot.Worms/Gen2/Armageddon/LandData.cs
+++ b/src/Syroot.Worms/Gen2/Armageddon/LandData.cs
@@ -74,17 +74,17 @@ namespace Syroot.Worms.Gen2.Armageddon
///
/// Gets or sets the visual foreground image.
///
- public Image Foreground { get; set; }
+ public ImageData Foreground { get; set; }
///
/// Gets or sets the collision mask of the landscape.
///
- public Image CollisionMask { get; set; }
+ public ImageData CollisionMask { get; set; }
///
/// Gets or sets the visual background image.
///
- public Image Background { get; set; }
+ public ImageData Background { get; set; }
///
/// Gets or sets the path to the land image file.
@@ -123,9 +123,9 @@ namespace Syroot.Worms.Gen2.Armageddon
ObjectLocations = reader.ReadStructs(reader.ReadInt32());
// Read the image data.
- Foreground = reader.Load();
- CollisionMask = reader.Load();
- Background = reader.Load();
+ Foreground = reader.Load();
+ CollisionMask = reader.Load();
+ Background = reader.Load();
// Read the file paths.
LandTexturePath = reader.ReadString(BinaryStringFormat.ByteLengthPrefix);
diff --git a/src/Syroot.Worms/Gen2/Armageddon/Team.cs b/src/Syroot.Worms/Gen2/Armageddon/Team.cs
index 1a7e5ff..682531b 100644
--- a/src/Syroot.Worms/Gen2/Armageddon/Team.cs
+++ b/src/Syroot.Worms/Gen2/Armageddon/Team.cs
@@ -81,7 +81,7 @@ namespace Syroot.Worms.Gen2.Armageddon
///
/// Gets or sets the team grave bitmap if it uses a custom one.
///
- public ImageData Grave { get; set; }
+ public BitmapData Grave { get; set; }
///
/// Gets or sets the team's special weapon.
@@ -151,7 +151,7 @@ namespace Syroot.Worms.Gen2.Armageddon
///
/// Gets or sets the bitmap of the team flag.
///
- public ImageData Flag { get; set; }
+ public BitmapData Flag { get; set; }
///
/// Gets or sets the deathmatch rank this team reached.
@@ -210,7 +210,7 @@ namespace Syroot.Worms.Gen2.Armageddon
if (GraveSprite < 0)
{
GraveFileName = reader.ReadFixedString(0x20);
- Grave = new ImageData()
+ Grave = new BitmapData()
{
BitsPerPixel = 8,
Size = new Vector2(24, 32),
@@ -233,7 +233,7 @@ namespace Syroot.Worms.Gen2.Armageddon
MissionStatuses = reader.ReadStructs(_missionCount);
FlagFileName = reader.ReadFixedString(0x20);
- Flag = new ImageData()
+ Flag = new BitmapData()
{
BitsPerPixel = 8,
Size = new Vector2(20, 17),
diff --git a/src/Syroot.Worms/Gen2/Image.cs b/src/Syroot.Worms/Gen2/ImageData.cs
similarity index 94%
rename from src/Syroot.Worms/Gen2/Image.cs
rename to src/Syroot.Worms/Gen2/ImageData.cs
index 385eb97..a6189d7 100644
--- a/src/Syroot.Worms/Gen2/Image.cs
+++ b/src/Syroot.Worms/Gen2/ImageData.cs
@@ -11,7 +11,7 @@ namespace Syroot.Worms.Gen2
/// Represents a (palettized) graphical image stored in an IMG file, possibly compressed.
/// Used by W2, WA and WWP. S. https://worms2d.info/Image_file.
///
- public class Image : ImageData, ILoadableFile, ISaveableFile
+ public class ImageData : BitmapData, ILoadableFile, ISaveableFile
{
// ---- CONSTANTS ----------------------------------------------------------------------------------------------
@@ -20,38 +20,38 @@ namespace Syroot.Worms.Gen2
// ---- CONSTRUCTORS & DESTRUCTOR ------------------------------------------------------------------------------
///
- /// Initializes a new instance of the class.
+ /// Initializes a new instance of the class.
///
- public Image()
+ public ImageData()
{
}
///
- /// Initializes a new instance of the class, loading the data from the given
+ /// Initializes a new instance of the class, loading the data from the given
/// .
///
/// The to load the data from.
- public Image(Stream stream)
+ public ImageData(Stream stream)
{
Load(stream);
}
///
- /// Initializes a new instance of the class, loading the data from the given file.
+ /// Initializes a new instance of the class, loading the data from the given file.
///
/// The name of the file to load the data from.
- public Image(string fileName)
+ public ImageData(string fileName)
{
Load(fileName);
}
///
- /// Initializes a new instance of the class, loading the data from the given
+ /// Initializes a new instance of the class, loading the data from the given
/// . The data block can be aligned to a 4-bte boundary.
///
/// The to load the data from.
/// true to align the data array by 4 bytes.
- internal Image(Stream stream, bool alignData)
+ internal ImageData(Stream stream, bool alignData)
{
Load(stream, alignData);
}
diff --git a/src/Syroot.Worms/Gen2/WorldParty/LandData.cs b/src/Syroot.Worms/Gen2/WorldParty/LandData.cs
index 249f521..5f70476 100644
--- a/src/Syroot.Worms/Gen2/WorldParty/LandData.cs
+++ b/src/Syroot.Worms/Gen2/WorldParty/LandData.cs
@@ -70,17 +70,17 @@ namespace Syroot.Worms.Gen2.WorldParty
///
/// Gets or sets the visual foreground image.
///
- public Image Foreground { get; set; }
+ public ImageData Foreground { get; set; }
///
/// Gets or sets the collision mask of the landscape.
///
- public Image CollisionMask { get; set; }
+ public ImageData CollisionMask { get; set; }
///
/// Gets or sets the visual background image.
///
- public Image Background { get; set; }
+ public ImageData Background { get; set; }
///
/// Gets or sets the path to the land image file.
@@ -118,9 +118,9 @@ namespace Syroot.Worms.Gen2.WorldParty
ObjectLocations = reader.ReadStructs(reader.ReadInt32());
// Read the image data.
- Foreground = new Image(stream, true);
- CollisionMask = new Image(stream, true);
- Background = new Image(stream, true);
+ Foreground = new ImageData(stream, true);
+ CollisionMask = new ImageData(stream, true);
+ Background = new ImageData(stream, true);
// Read the file paths.
LandTexturePath = reader.ReadString(BinaryStringFormat.ByteLengthPrefix);
diff --git a/src/Syroot.Worms/Gen2/WorldParty/Team.cs b/src/Syroot.Worms/Gen2/WorldParty/Team.cs
index 6e2df9f..2187561 100644
--- a/src/Syroot.Worms/Gen2/WorldParty/Team.cs
+++ b/src/Syroot.Worms/Gen2/WorldParty/Team.cs
@@ -79,7 +79,7 @@ namespace Syroot.Worms.Gen2.WorldParty
///
/// Gets or sets the team grave bitmap if it uses a custom one.
///
- public ImageData Grave { get; set; }
+ public BitmapData Grave { get; set; }
///
/// Gets or sets the team's special weapon.
@@ -149,7 +149,7 @@ namespace Syroot.Worms.Gen2.WorldParty
///
/// Gets or sets the bitmap of the team flag.
///
- public ImageData Flag { get; set; }
+ public BitmapData Flag { get; set; }
///
/// Gets or sets an unknown value.
@@ -209,7 +209,7 @@ namespace Syroot.Worms.Gen2.WorldParty
if (GraveSprite < 0)
{
GraveFileName = reader.ReadFixedString(0x20);
- Grave = new ImageData()
+ Grave = new BitmapData()
{
BitsPerPixel = 8,
Size = new Vector2(24, 32),
@@ -232,7 +232,7 @@ namespace Syroot.Worms.Gen2.WorldParty
MissionStatuses = reader.ReadStructs(_missionCount);
FlagFileName = reader.ReadFixedString(0x20);
- Flag = new ImageData()
+ Flag = new BitmapData()
{
BitsPerPixel = 8,
Size = new Vector2(20, 17),
diff --git a/src/Syroot.Worms/Gen2/Worms2/LandData.cs b/src/Syroot.Worms/Gen2/Worms2/LandData.cs
index 23e487a..23deb3f 100644
--- a/src/Syroot.Worms/Gen2/Worms2/LandData.cs
+++ b/src/Syroot.Worms/Gen2/Worms2/LandData.cs
@@ -69,22 +69,22 @@ namespace Syroot.Worms.Gen2.Worms2
///
/// Gets or sets the visual foreground image.
///
- public Image Foreground { get; set; }
+ public ImageData Foreground { get; set; }
///
/// Gets or sets the collision mask of the landscape.
///
- public Image CollisionMask { get; set; }
+ public ImageData CollisionMask { get; set; }
///
/// Gets or sets the visual background image.
///
- public Image Background { get; set; }
+ public ImageData Background { get; set; }
///
/// Gets or sets an image of unknown use.
///
- public Image UnknownImage { get; set; }
+ public ImageData UnknownImage { get; set; }
///
/// Gets or sets the path to the land image file.
@@ -122,10 +122,10 @@ namespace Syroot.Worms.Gen2.Worms2
Unknown = reader.ReadInt32();
// Read the image data.
- Foreground = reader.Load();
- CollisionMask = reader.Load();
- Background = reader.Load();
- UnknownImage = reader.Load();
+ Foreground = reader.Load();
+ CollisionMask = reader.Load();
+ Background = reader.Load();
+ UnknownImage = reader.Load();
// Read the file paths.
LandTexturePath = reader.ReadString(BinaryStringFormat.ByteLengthPrefix);
diff --git a/src/Syroot.Worms/Syroot.Worms.csproj b/src/Syroot.Worms/Syroot.Worms.csproj
index 10e25bb..606152a 100644
--- a/src/Syroot.Worms/Syroot.Worms.csproj
+++ b/src/Syroot.Worms/Syroot.Worms.csproj
@@ -6,7 +6,7 @@
Syroot.Worms
Worms
Syroot
- 1.0.0-alpha2
+ 1.0.0-alpha3
Syroot.Worms
worms;team17