diff --git a/res/Logo.png b/res/Logo.png new file mode 100644 index 0000000..f5272dc Binary files /dev/null and b/res/Logo.png differ diff --git a/res/Logo.svg b/res/Logo.svg new file mode 100644 index 0000000..74f7104 --- /dev/null +++ b/res/Logo.svg @@ -0,0 +1,113 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/src/NuGet.config b/src/NuGet.config deleted file mode 100644 index b1738fc..0000000 --- a/src/NuGet.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/Syroot.Worms/Core/ByteExtensions.cs b/src/Syroot.Worms/Core/ByteExtensions.cs index b57ef7c..8d6f4ca 100644 --- a/src/Syroot.Worms/Core/ByteExtensions.cs +++ b/src/Syroot.Worms/Core/ByteExtensions.cs @@ -1,3 +1,5 @@ +using System; + namespace Syroot.Worms.Core { /// @@ -121,7 +123,7 @@ namespace Syroot.Worms.Core /// The extended instance. /// The number of least significant bits which are used to store the /// value. - /// The first bit of the encoded value. + /// The first bit of the encoded value. /// The decoded . internal static byte DecodeByte(this byte self, int bits, int firstBit) { @@ -148,7 +150,7 @@ namespace Syroot.Worms.Core /// The extended instance. /// The number of least significant bits which are used to store the /// value. - /// The first bit of the encoded value. + /// The first bit of the encoded value. /// The decoded . internal static sbyte DecodeSByte(this byte self, int bits, int firstBit) { @@ -170,6 +172,7 @@ namespace Syroot.Worms.Core /// . /// /// The extended instance. + /// The value to encode. /// The number of bits which are used to store the value. /// The current byte with the value encoded into it. internal static byte Encode(this byte self, byte value, int bits) @@ -182,8 +185,9 @@ namespace Syroot.Worms.Core /// starting at . /// /// The extended instance. + /// The value to encode. /// The number of bits which are used to store the value. - /// The first bit used for the encoded value. + /// The first bit used for the encoded value. /// The current byte with the value encoded into it. internal static byte Encode(this byte self, byte value, int bits, int firstBit) { @@ -201,6 +205,7 @@ namespace Syroot.Worms.Core /// . /// /// The extended instance. + /// The value to encode. /// The number of bits which are used to store the value. /// The current byte with the value encoded into it. internal static byte Encode(this byte self, sbyte value, int bits) @@ -213,8 +218,9 @@ namespace Syroot.Worms.Core /// starting at . /// /// The extended instance. + /// The value to encode. /// The number of bits which are used to store the value. - /// The first bit used for the encoded value. + /// The first bit used for the encoded value. /// The current byte with the value encoded into it. internal static byte Encode(this byte self, sbyte value, int bits, int firstBit) { diff --git a/src/Syroot.Worms/Core/Team17Compression.cs b/src/Syroot.Worms/Core/Team17Compression.cs index db66aeb..08258d1 100644 --- a/src/Syroot.Worms/Core/Team17Compression.cs +++ b/src/Syroot.Worms/Core/Team17Compression.cs @@ -13,7 +13,7 @@ namespace Syroot.Worms.Core // ---- METHODS (INTERNAL) ------------------------------------------------------------------------------------- /// - /// Returns the data available in in compressed format. + /// Returns the data available in in compressed format. /// /// The data to compress. /// The compressed data. diff --git a/src/Syroot.Worms/Gen2/Armageddon/Team.cs b/src/Syroot.Worms/Gen2/Armageddon/Team.cs index fab4939..1a7e5ff 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 Bitmap Grave { get; set; } + public ImageData 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 Bitmap Flag { get; set; } + public ImageData 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 Bitmap() + Grave = new ImageData() { 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 Bitmap() + Flag = new ImageData() { BitsPerPixel = 8, Size = new Vector2(20, 17), diff --git a/src/Syroot.Worms/Gen2/Image.cs b/src/Syroot.Worms/Gen2/Image.cs index 2c58b96..385eb97 100644 --- a/src/Syroot.Worms/Gen2/Image.cs +++ b/src/Syroot.Worms/Gen2/Image.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 : Bitmap, ILoadableFile, ISaveableFile + public class Image : ImageData, ILoadableFile, ISaveableFile { // ---- CONSTANTS ---------------------------------------------------------------------------------------------- diff --git a/src/Syroot.Worms/Gen2/WorldParty/Team.cs b/src/Syroot.Worms/Gen2/WorldParty/Team.cs index b7c040f..6e2df9f 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 Bitmap Grave { get; set; } + public ImageData 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 Bitmap Flag { get; set; } + public ImageData 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 Bitmap() + Grave = new ImageData() { 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 Bitmap() + Flag = new ImageData() { BitsPerPixel = 8, Size = new Vector2(20, 17), diff --git a/src/Syroot.Worms/Gen2/Worms2/SchemeOptions.cs b/src/Syroot.Worms/Gen2/Worms2/SchemeOptions.cs index 44e3df2..d56fe03 100644 --- a/src/Syroot.Worms/Gen2/Worms2/SchemeOptions.cs +++ b/src/Syroot.Worms/Gen2/Worms2/SchemeOptions.cs @@ -282,7 +282,7 @@ namespace Syroot.Worms.Gen2.Worms2 } /// - /// Saves the data into the given with the specified . + /// Saves the data into the given . /// /// The to save the data to. public void Save(Stream stream) diff --git a/src/Syroot.Worms/Gen2/Worms2/SchemeWeapons.cs b/src/Syroot.Worms/Gen2/Worms2/SchemeWeapons.cs index 3319619..34fd79d 100644 --- a/src/Syroot.Worms/Gen2/Worms2/SchemeWeapons.cs +++ b/src/Syroot.Worms/Gen2/Worms2/SchemeWeapons.cs @@ -93,7 +93,7 @@ namespace Syroot.Worms.Gen2.Worms2 } /// - /// Saves the data into the given with the specified . + /// Saves the data into the given . /// /// The to save the data to. public void Save(Stream stream) diff --git a/src/Syroot.Worms/Bitmap.cs b/src/Syroot.Worms/ImageData.cs similarity index 97% rename from src/Syroot.Worms/Bitmap.cs rename to src/Syroot.Worms/ImageData.cs index 3e2a22b..4b262ff 100644 --- a/src/Syroot.Worms/Bitmap.cs +++ b/src/Syroot.Worms/ImageData.cs @@ -5,7 +5,7 @@ namespace Syroot.Worms /// /// Represents a pixel-based 2D image in different color formats. /// - public class Bitmap + public class ImageData { // ---- PROPERTIES --------------------------------------------------------------------------------------------- diff --git a/src/Syroot.Worms/Syroot.Worms.csproj b/src/Syroot.Worms/Syroot.Worms.csproj index c9c92a4..16a8601 100644 --- a/src/Syroot.Worms/Syroot.Worms.csproj +++ b/src/Syroot.Worms/Syroot.Worms.csproj @@ -6,11 +6,11 @@ Syroot.Worms Worms Syroot - 0.1.0 + 1.0.0-alpha1 Syroot.Worms worms;team17 - Initial alpha release. + Initial release. https://raw.githubusercontent.com/Syroot/Worms/master/res/Logo.png https://github.com/Syroot/Worms https://raw.githubusercontent.com/Syroot/Worms/master/LICENSE @@ -21,12 +21,11 @@ - - +