diff options
| author | Ac_K <Acoustik666@gmail.com> | 2021-03-18 21:40:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-18 21:40:20 +0100 |
| commit | a56423802cd6e74809c1cf5d93b51fdf11f07bef (patch) | |
| tree | 124cd814b327ea1eb446f6c867a34491ffe16b0d /Ryujinx.HLE/HOS/Services/Mii | |
| parent | 2b92c10105c8c7fcae3ab39d473f640c846a24ce (diff) | |
nfp: Amiibo scanning support (#2006)
* Initial Impl.
* You just want me cause I'm next
* Fix some logics
* Fix close button
Diffstat (limited to 'Ryujinx.HLE/HOS/Services/Mii')
| -rw-r--r-- | Ryujinx.HLE/HOS/Services/Mii/Types/CoreData.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Ryujinx.HLE/HOS/Services/Mii/Types/CoreData.cs b/Ryujinx.HLE/HOS/Services/Mii/Types/CoreData.cs index 1b11f99d..39a3945b 100644 --- a/Ryujinx.HLE/HOS/Services/Mii/Types/CoreData.cs +++ b/Ryujinx.HLE/HOS/Services/Mii/Types/CoreData.cs @@ -389,7 +389,7 @@ namespace Ryujinx.HLE.HOS.Services.Mii.Types coreData.SetDefault(); - if (gender == Types.Gender.All) + if (gender == Gender.All) { gender = (Gender)utilImpl.GetRandom((int)gender); } @@ -432,7 +432,7 @@ namespace Ryujinx.HLE.HOS.Services.Mii.Types int axisY = 0; - if (gender == Types.Gender.Female && age == Age.Young) + if (gender == Gender.Female && age == Age.Young) { axisY = utilImpl.GetRandom(3); } @@ -466,8 +466,8 @@ namespace Ryujinx.HLE.HOS.Services.Mii.Types // Eye coreData.EyeType = (EyeType)eyeTypeInfo.Values[utilImpl.GetRandom(eyeTypeInfo.ValuesCount)]; - int eyeRotateKey1 = gender != Types.Gender.Male ? 4 : 2; - int eyeRotateKey2 = gender != Types.Gender.Male ? 3 : 4; + int eyeRotateKey1 = gender != Gender.Male ? 4 : 2; + int eyeRotateKey2 = gender != Gender.Male ? 3 : 4; byte eyeRotateOffset = (byte)(32 - EyeRotateTable[eyeRotateKey1] + eyeRotateKey2); byte eyeRotate = (byte)(32 - EyeRotateTable[(int)coreData.EyeType]); @@ -496,14 +496,14 @@ namespace Ryujinx.HLE.HOS.Services.Mii.Types coreData.EyebrowY = (byte)(axisY + eyebrowY); // Nose - int noseScale = gender == Types.Gender.Female ? 3 : 4; + int noseScale = gender == Gender.Female ? 3 : 4; coreData.NoseType = (NoseType)noseTypeInfo.Values[utilImpl.GetRandom(noseTypeInfo.ValuesCount)]; coreData.NoseScale = (byte)noseScale; coreData.NoseY = (byte)(axisY + 9); // Mouth - int mouthColor = gender == Types.Gender.Female ? utilImpl.GetRandom(0, 4) : 0; + int mouthColor = gender == Gender.Female ? utilImpl.GetRandom(0, 4) : 0; coreData.MouthType = (MouthType)mouthTypeInfo.Values[utilImpl.GetRandom(mouthTypeInfo.ValuesCount)]; coreData.MouthColor = (CommonColor)Helper.Ver3MouthColorTable[mouthColor]; @@ -515,7 +515,7 @@ namespace Ryujinx.HLE.HOS.Services.Mii.Types coreData.BeardColor = coreData.HairColor; coreData.MustacheScale = 4; - if (gender == Types.Gender.Male && age != Age.Young && utilImpl.GetRandom(10) < 2) + if (gender == Gender.Male && age != Age.Young && utilImpl.GetRandom(10) < 2) { BeardAndMustacheFlag mustacheAndBeardFlag = (BeardAndMustacheFlag)utilImpl.GetRandom(3); |