GitLab/Worms2server
1
0
Fork 0
mirror of https://gitlab.com/Syroot/Worms.git synced 2025-01-13 15:27:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed XML summaries, added logo.

Browse Source
This commit is contained in:
Ray Koopa 2017-05-03 15:46:44 +02:00
parent ff042f1fc2
commit b24082bc24
12 changed files with 139 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
res/Logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.8 KiB

113
res/Logo.svg Normal file
View File

@ -0,0 +1,113 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
id="svg3039"
version="1.1"
inkscape:version="0.92.0 r15299"
width="64"
height="64"
sodipodi:docname="Logo.svg"
inkscape:export-filename="Logo.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96">
<metadata
id="metadata3045">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs3043" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="2560"
inkscape:window-height="1377"
id="namedview3041"
showgrid="false"
showguides="true"
inkscape:guide-bbox="true"
inkscape:zoom="4.1688"
inkscape:cx="55.144839"
inkscape:cy="55.225208"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="g3889"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0" />
<g
id="g3889"
transform="translate(-7.8100759,-66.876826)">
<path
style="fill:#f0eff1;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
d="m 27.04262,126.71289 c -1.181776,-1.55006 -1.966744,-3.43909 -2.368435,-5.34643 -0.731962,-3.47556 0.09235,-5.94777 0.01998,-10.65539 -1.181472,-0.48787 -1.759686,-1.09396 -2.451634,-1.84793 -0.54815,-0.59728 -1.00234,-1.30327 -1.292215,-2.06037 -0.32661,-0.85304 -0.539845,-1.78974 -0.466734,-2.70023 0.06964,-0.86724 0.419788,-1.86425 0.849262,-2.46806 -2.222622,-2.315179 -5.867212,-9.13785 -7.388442,-14.27538 -0.627091,-2.117826 -1.043782,-4.421047 -0.649327,-6.594253 0.555377,-3.059784 1.963392,-6.129269 4.118816,-8.370897 2.426515,-2.523562 5.794227,-4.355239 9.234755,-5.002661 5.494996,-1.034023 11.734091,-0.591808 16.644562,2.082413 3.532402,1.923732 6.734565,5.354675 7.754134,9.245561 1.992433,7.603525 -2.025069,17.565155 -4.34531,23.176897 0.372134,1.17735 0.38457,2.09971 0.0082,3.21285 0.749005,-1.22124 4.617222,-1.26695 6.698763,-0.44528 2.151128,0.84914 3.662957,3.01905 4.741805,5.06463 1.345959,2.55205 1.452591,4.39726 1.87347,8.45051 3.361416,-0.18651 4.546466,0.75415 5.629108,2.49832 1.281217,2.06409 0.988026,5.22596 -0.30647,7.28174 -0.983854,1.56245 -3.082892,2.22379 -4.890208,2.6017 -2.756327,0.57634 -7.55332,-0.082 -8.422992,-0.64716 -1.45258,-0.87758 -2.109794,-2.9623 -2.521142,-4.48379 -1.402821,1.51154 -3.163799,3.01285 -5.10957,3.91927 -2.09583,0.97633 -4.460352,1.39763 -6.772715,1.49729 -2.215996,0.0955 -4.559406,0.009 -6.594511,-0.87097 -1.577588,-0.68223 -2.951008,-1.89553 -3.993098,-3.26238 z"
id="path3866"
inkscape:connector-curvature="0"
sodipodi:nodetypes="aacaaacaaaaaaccaacaaaccaaaa" />
<path
sodipodi:nodetypes="acacaaaaacaaaaacccacaaacaaaacaccaaaaa"
inkscape:connector-curvature="0"
id="path3863"
d="m 27.793976,121.07863 c -0.938536,-3.15558 -0.431941,-7.06522 -0.225814,-9.874 1.138774,0.22476 2.717839,0.0994 3.985541,-0.31129 1.841729,-0.5966 4.299757,-1.43626 4.955594,-3.02871 0.236765,-0.63702 0.345752,-1.15549 0.06504,-1.61557 -0.193357,-0.31691 -0.638827,-0.46544 -1.010038,-0.46919 -1.673779,-0.0169 -2.943507,1.75701 -4.596122,2.02285 -1.760095,0.28312 -3.745971,0.31928 -5.323725,-0.51064 -1.09879,-0.57799 -2.201799,-1.62705 -2.39356,-2.85368 -0.154663,-0.98932 0.23963,-2.16839 1.135926,-2.78097 -2.929955,-3.399706 -8.1456,-12.579671 -8.160525,-19.681834 -0.0044,-2.109158 1.048726,-4.234736 2.398876,-5.855128 1.71254,-2.055312 4.188437,-3.580424 6.755692,-4.332973 4.127116,-1.209799 8.848113,-1.435252 12.902341,0 3.39863,1.203161 7.071834,3.456088 8.406815,6.805122 2.936371,7.366413 -1.457276,15.631594 -3.123633,23.584293 0.515326,1.26768 0.641215,2.38898 0.539889,2.96776 -0.154313,3.04461 -3.141404,4.07388 -3.239326,5.47599 -0.02063,0.58726 0.341836,1.39745 0.91974,1.50395 1.775112,0.32715 3.061188,-2.30516 4.286317,-3.30904 1.117915,-0.89135 1.996385,-0.9664 3.077678,-1.08716 0.874694,-0.0977 1.799048,-0.002 2.622308,0.3085 0.865772,0.32731 1.72577,0.84177 2.282632,1.5811 2.403642,3.1912 3.475179,7.7645 3.839445,11.35383 0.4388,-0.041 1.184307,-0.25821 1.779541,-0.20907 0.737401,0.0608 1.50374,0.22656 2.132242,0.61701 0.629338,0.39097 1.226145,0.95186 1.499881,1.64033 0.325059,0.81755 0.486956,1.87965 0.04271,2.63906 -0.723244,1.23633 -1.896504,1.92514 -3.779208,2.04498 -2.093197,0.12713 -3.819496,0.14085 -5.585908,-0.46833 -0.51923,-0.17906 -1.046235,-0.49834 -1.377768,-0.90375 -0.690384,-0.61349 -1.704647,-5.64303 -2.331707,-7.49746 -0.844935,1.6212 -1.981417,3.77823 -3.430533,5.30695 -0.873833,0.92182 -1.927815,1.71307 -3.085071,2.23666 -1.825122,0.82576 -3.858872,1.28185 -5.861626,1.3259 -2.28516,0.0503 -4.857846,0.0676 -6.748215,-1.21733 -1.75457,-1.19259 -2.750631,-3.37468 -3.355429,-5.40816 z"
style="fill:#424242;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
<path
sodipodi:nodetypes="aaaaaasa"
inkscape:connector-curvature="0"
id="path3852"
d="m 24.845061,101.57125 c -0.757785,-0.16767 -1.362649,-0.8291 -1.812441,-1.46158 -2.864311,-4.027717 -5.244139,-9.020989 -5.003042,-13.957446 0.05609,-1.148428 0.472152,-2.555423 1.474802,-3.118219 0.785949,-0.441159 1.946104,-0.224569 2.688711,0.28619 1.490827,1.025381 1.978028,3.093067 2.467387,4.835045 1.194569,4.252334 1.587326,10.668599 1.004252,13.2127 -0.07475,0.32614 -0.544814,0.26412 -0.819669,0.20331 z"
style="fill:#f0eff1;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
<path
sodipodi:nodetypes="aaaaaaaaa"
inkscape:connector-curvature="0"
id="path3854"
d="m 30.698047,101.30525 c -0.696747,-0.19779 -1.080939,-0.99485 -1.450625,-1.617677 -1.7475,-2.944117 -2.997748,-6.285458 -3.428451,-9.681934 -0.219233,-1.728845 -0.303507,-3.641173 0.459783,-5.207813 0.653868,-1.342053 1.810141,-2.749695 3.270463,-3.059737 1.927361,-0.409199 4.220692,0.514482 5.58488,1.936158 1.292526,1.346999 1.657827,3.496363 1.614575,5.362684 -0.09581,4.134002 -1.123529,8.853546 -4.122816,11.700209 -0.48591,0.46118 -1.283351,0.75106 -1.927809,0.56811 z"
style="fill:#f0eff1;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
<path
sodipodi:nodetypes="aaaaa"
inkscape:connector-curvature="0"
id="path3053"
d="m 23.111155,79.209874 c -0.01138,-1.138917 -1.930391,-1.44014 -3.067506,-1.505266 -1.227005,-0.07027 -3.445842,0.007 -3.473799,1.235725 -0.03231,1.419638 2.525944,1.671948 3.944553,1.608843 0.972968,-0.04328 2.606486,-0.365424 2.596752,-1.339302 z"
style="fill:#f0eff1;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
<path
sodipodi:nodetypes="caaaac"
inkscape:connector-curvature="0"
id="path3049"
d="m 29.471776,95.528773 c -1.113382,-2.31393 -2.039835,-6.332128 -0.123439,-8.229053 0.525742,-0.5204 1.661753,-0.39519 2.179449,0.133771 1.713921,1.751223 1.246507,5.081874 0.515104,7.455946 -0.180015,0.584323 -0.54871,1.299349 -1.129933,1.42105 -0.531671,0.111328 -1.046805,-0.154223 -1.441181,-0.781714 z"
style="fill:#424242;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
<path
sodipodi:nodetypes="saaas"
inkscape:connector-curvature="0"
id="path3055"
d="m 25.360823,78.864231 c -0.04026,-1.419992 4.606645,-2.402702 7.123563,-2.53499 1.588866,-0.08351 4.506608,-0.465415 4.639913,1.120045 0.145405,1.729321 -3.071775,1.778317 -4.78587,2.049595 -2.306761,0.365074 -6.940969,0.657497 -6.977606,-0.63465 z"
style="fill:#f0eff1;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
<path
sodipodi:nodetypes="aaaasa"
inkscape:connector-curvature="0"
id="path3051"
d="m 19.499778,91.756829 c -0.336512,-1.403856 -0.725814,-3.395762 0.388636,-4.3134 0.595308,-0.490178 1.713417,-0.260854 2.301122,0.238413 1.282561,1.08956 1.273616,3.189522 1.325224,4.871612 0.04396,1.432965 -0.03199,4.135797 -0.872415,4.211507 -1.153711,0.103931 -2.683166,-3.091608 -3.142567,-5.008132 z"
style="fill:#424242;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 9.7 KiB

6
src/NuGet.config
View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="ImageSharp Nightly" value="https://www.myget.org/F/imagesharp/api/v3/index.json" />
</packageSources>
</configuration>

14
src/Syroot.Worms/Core/ByteExtensions.cs
View File

@ -1,3 +1,5 @@
using System;
namespace Syroot.Worms.Core
{
/// <summary>
@ -121,7 +123,7 @@ namespace Syroot.Worms.Core
/// <param name="self">The extended <see cref="Byte"/> instance.</param>
/// <param name="bits">The number of least significant bits which are used to store the <see cref="Byte"/>
/// value.</param>
/// <paramref name="firstBit"/>The first bit of the encoded value.</param>
/// <param name="firstBit">The first bit of the encoded value.</param>
/// <returns>The decoded <see cref="Byte"/>.</returns>
internal static byte DecodeByte(this byte self, int bits, int firstBit)
{
@ -148,7 +150,7 @@ namespace Syroot.Worms.Core
/// <param name="self">The extended <see cref="Byte"/> instance.</param>
/// <param name="bits">The number of least significant bits which are used to store the <see cref="SByte"/>
/// value.</param>
/// <paramref name="firstBit"/>The first bit of the encoded value.</param>
/// <param name="firstBit">The first bit of the encoded value.</param>
/// <returns>The decoded <see cref="SByte"/>.</returns>
internal static sbyte DecodeSByte(this byte self, int bits, int firstBit)
{
@ -170,6 +172,7 @@ namespace Syroot.Worms.Core
/// <paramref name="bits"/>.
/// </summary>
/// <param name="self">The extended <see cref="Byte"/> instance.</param>
/// <param name="value">The value to encode.</param>
/// <param name="bits">The number of bits which are used to store the <see cref="Byte"/> value.</param>
/// <returns>The current byte with the value encoded into it.</returns>
internal static byte Encode(this byte self, byte value, int bits)
@ -182,8 +185,9 @@ namespace Syroot.Worms.Core
/// <paramref name="bits"/> starting at <paramref name="firstBit"/>.
/// </summary>
/// <param name="self">The extended <see cref="Byte"/> instance.</param>
/// <param name="value">The value to encode.</param>
/// <param name="bits">The number of bits which are used to store the <see cref="Byte"/> value.</param>
/// <param name="firstBit"/>The first bit used for the encoded value.</param>
/// <param name="firstBit">The first bit used for the encoded value.</param>
/// <returns>The current byte with the value encoded into it.</returns>
internal static byte Encode(this byte self, byte value, int bits, int firstBit)
{
@ -201,6 +205,7 @@ namespace Syroot.Worms.Core
/// <paramref name="bits"/>.
/// </summary>
/// <param name="self">The extended <see cref="Byte"/> instance.</param>
/// <param name="value">The value to encode.</param>
/// <param name="bits">The number of bits which are used to store the <see cref="SByte"/> value.</param>
/// <returns>The current byte with the value encoded into it.</returns>
internal static byte Encode(this byte self, sbyte value, int bits)
@ -213,8 +218,9 @@ namespace Syroot.Worms.Core
/// <paramref name="bits"/> starting at <paramref name="firstBit"/>.
/// </summary>
/// <param name="self">The extended <see cref="Byte"/> instance.</param>
/// <param name="value">The value to encode.</param>
/// <param name="bits">The number of bits which are used to store the <see cref="SByte"/> value.</param>
/// <param name="firstBit"/>The first bit used for the encoded value.</param>
/// <param name="firstBit">The first bit used for the encoded value.</param>
/// <returns>The current byte with the value encoded into it.</returns>
internal static byte Encode(this byte self, sbyte value, int bits, int firstBit)
{

2
src/Syroot.Worms/Core/Team17Compression.cs
View File

@ -13,7 +13,7 @@ namespace Syroot.Worms.Core
// ---- METHODS (INTERNAL) -------------------------------------------------------------------------------------
/// <summary>
/// Returns the data available in <see cref="bytes"/> in compressed format.
/// Returns the data available in <paramref name="bytes"/> in compressed format.
/// </summary>
/// <param name="bytes">The data to compress.</param>
/// <returns>The compressed data.</returns>

8
src/Syroot.Worms/Gen2/Armageddon/Team.cs
View File

@ -81,7 +81,7 @@ namespace Syroot.Worms.Gen2.Armageddon
/// <summary>
/// Gets or sets the team grave bitmap if it uses a custom one.
/// </summary>
public Bitmap Grave { get; set; }
public ImageData Grave { get; set; }
/// <summary>
/// Gets or sets the team's special weapon.
@ -151,7 +151,7 @@ namespace Syroot.Worms.Gen2.Armageddon
/// <summary>
/// Gets or sets the bitmap of the team flag.
/// </summary>
public Bitmap Flag { get; set; }
public ImageData Flag { get; set; }
/// <summary>
/// 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<TeamMissionStatus>(_missionCount);
FlagFileName = reader.ReadFixedString(0x20);
Flag = new Bitmap()
Flag = new ImageData()
{
BitsPerPixel = 8,
Size = new Vector2(20, 17),

2
src/Syroot.Worms/Gen2/Image.cs
View File

@ -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.
/// </summary>
public class Image : Bitmap, ILoadableFile, ISaveableFile
public class Image : ImageData, ILoadableFile, ISaveableFile
{
// ---- CONSTANTS ----------------------------------------------------------------------------------------------

8
src/Syroot.Worms/Gen2/WorldParty/Team.cs
View File

@ -79,7 +79,7 @@ namespace Syroot.Worms.Gen2.WorldParty
/// <summary>
/// Gets or sets the team grave bitmap if it uses a custom one.
/// </summary>
public Bitmap Grave { get; set; }
public ImageData Grave { get; set; }
/// <summary>
/// Gets or sets the team's special weapon.
@ -149,7 +149,7 @@ namespace Syroot.Worms.Gen2.WorldParty
/// <summary>
/// Gets or sets the bitmap of the team flag.
/// </summary>
public Bitmap Flag { get; set; }
public ImageData Flag { get; set; }
/// <summary>
/// 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<TeamMissionStatus>(_missionCount);
FlagFileName = reader.ReadFixedString(0x20);
Flag = new Bitmap()
Flag = new ImageData()
{
BitsPerPixel = 8,
Size = new Vector2(20, 17),

2
src/Syroot.Worms/Gen2/Worms2/SchemeOptions.cs
View File

@ -282,7 +282,7 @@ namespace Syroot.Worms.Gen2.Worms2
}
/// <summary>
/// Saves the data into the given <paramref name="stream"/> with the specified <paramref name="format"/>.
/// Saves the data into the given <paramref name="stream"/>.
/// </summary>
/// <param name="stream">The <see cref="Stream"/> to save the data to.</param>
public void Save(Stream stream)

2
src/Syroot.Worms/Gen2/Worms2/SchemeWeapons.cs
View File

@ -93,7 +93,7 @@ namespace Syroot.Worms.Gen2.Worms2
}
/// <summary>
/// Saves the data into the given <paramref name="stream"/> with the specified <paramref name="format"/>.
/// Saves the data into the given <paramref name="stream"/>.
/// </summary>
/// <param name="stream">The <see cref="Stream"/> to save the data to.</param>
public void Save(Stream stream)

2
src/Syroot.Worms/Bitmap.cs → src/Syroot.Worms/ImageData.cs
View File

@ -5,7 +5,7 @@ namespace Syroot.Worms
/// <summary>
/// Represents a pixel-based 2D image in different color formats.
/// </summary>
public class Bitmap
public class ImageData
{
// ---- PROPERTIES ---------------------------------------------------------------------------------------------

7
src/Syroot.Worms/Syroot.Worms.csproj
View File

@ -6,11 +6,11 @@
<AssemblyName>Syroot.Worms</AssemblyName>
<AssemblyTitle>Worms</AssemblyTitle>
<Authors>Syroot</Authors>
<VersionPrefix>0.1.0</VersionPrefix>
<VersionPrefix>1.0.0-alpha1</VersionPrefix>
<PackageId>Syroot.Worms</PackageId>
<PackageTags>worms;team17</PackageTags>
<PackageReleaseNotes>Initial alpha release.</PackageReleaseNotes>
<PackageReleaseNotes>Initial release.</PackageReleaseNotes>
<PackageIconUrl>https://raw.githubusercontent.com/Syroot/Worms/master/res/Logo.png</PackageIconUrl>
<PackageProjectUrl>https://github.com/Syroot/Worms</PackageProjectUrl>
<PackageLicenseUrl>https://raw.githubusercontent.com/Syroot/Worms/master/LICENSE</PackageLicenseUrl>
@ -21,12 +21,11 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="ImageSharp" Version="1.0.0-alpha7-00006" />
<PackageReference Include="Syroot.IO.BinaryData" Version="2.0.0-rc1" />
<PackageReference Include="Syroot.Maths" Version="1.3.1" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net45'">
<ItemGroup Condition="'$(TargetFramework)' == 'net46'">
<Reference Include="System" />
</ItemGroup>