Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Add a test that creates, deletes and creates a character (#2193)

Browse Source 
* Add a test that creates, deletes and creates a character

* My prs conflict with my other prs

Bottom text

* Add checking for profile equality between client and server

* Fix randomizing outside of an assert and add equals/hashcode and fix equality check

* Fix colors being slightly off when received by the server
This commit is contained in:
DrSmugleaf
2020-10-12 18:26:17 +02:00
committed by GitHub
parent 4c72109cdf
commit 43a156bd3b
3 changed files with 156 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Content.Shared/Preferences/HumanoidCharacterAppearance.cs
View File

@@ -20,11 +20,11 @@ namespace Content.Shared.Preferences
Color skinColor)
{
HairStyleName = hairStyleName;
HairColor = hairColor;
HairColor = ClampColor(hairColor);
FacialHairStyleName = facialHairStyleName;
FacialHairColor = facialHairColor;
EyeColor = eyeColor;
SkinColor = skinColor;
FacialHairColor = ClampColor(facialHairColor);
EyeColor = ClampColor(eyeColor);
SkinColor = ClampColor(skinColor);
}
public string HairStyleName { get; }
@@ -102,6 +102,11 @@ namespace Content.Shared.Preferences
}
}
public static Color ClampColor(Color color)
{
return new Color(color.RByte, color.GByte, color.BByte);
}
public static HumanoidCharacterAppearance EnsureValid(HumanoidCharacterAppearance appearance)
{
string hairStyleName;
@@ -136,22 +141,17 @@ namespace Content.Shared.Preferences
facialHairColor,
eyeColor,
skinColor);
static Color ClampColor(Color color)
{
return new Color(color.RByte, color.GByte, color.BByte);
}
}
public bool MemberwiseEquals(ICharacterAppearance maybeOther)
{
if (!(maybeOther is HumanoidCharacterAppearance other)) return false;
if (HairStyleName != other.HairStyleName) return false;
if (HairColor != other.HairColor) return false;
if (!HairColor.Equals(other.HairColor)) return false;
if (FacialHairStyleName != other.FacialHairStyleName) return false;
if (FacialHairColor != other.FacialHairColor) return false;
if (EyeColor != other.EyeColor) return false;
if (SkinColor != other.SkinColor) return false;
if (!FacialHairColor.Equals(other.FacialHairColor)) return false;
if (!EyeColor.Equals(other.EyeColor)) return false;
if (!SkinColor.Equals(other.SkinColor)) return false;
return true;
}
}

18
Content.Shared/Preferences/HumanoidCharacterProfile.cs
View File

@@ -1,3 +1,4 @@
#nullable enable
using System;
using System.Collections.Generic;
using System.Linq;
@@ -243,5 +244,22 @@ namespace Content.Shared.Preferences
if (!_antagPreferences.SequenceEqual(other._antagPreferences)) return false;
return Appearance.MemberwiseEquals(other.Appearance);
}
public override bool Equals(object? obj)
{
return obj is HumanoidCharacterProfile other && MemberwiseEquals(other);
}
public override int GetHashCode()
{
return HashCode.Combine(
Name,
Age,
Sex,
PreferenceUnavailable,
_jobPriorities,
_antagPreferences,
Appearance);
}
}
}