tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Validate some SpeciesPrototype fields (#35965)

Browse Source 
* Convert SpeciesPrototype strings to ProtoIds

* Simplify protoman indexing calls
This commit is contained in:
Tayrtahn
2025-03-20 16:15:30 -04:00
committed by GitHub
parent ecf22daff7
commit b780b74bbd
5 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Shared/Humanoid/NamingSystem.cs
View File

@@ -48,20 +48,20 @@ namespace Content.Shared.Humanoid
switch (gender)
{
case Gender.Male:
return _random.Pick(_prototypeManager.Index<LocalizedDatasetPrototype>(speciesProto.MaleFirstNames));
return _random.Pick(_prototypeManager.Index(speciesProto.MaleFirstNames));
case Gender.Female:
return _random.Pick(_prototypeManager.Index<LocalizedDatasetPrototype>(speciesProto.FemaleFirstNames));
return _random.Pick(_prototypeManager.Index(speciesProto.FemaleFirstNames));
default:
if (_random.Prob(0.5f))
return _random.Pick(_prototypeManager.Index<LocalizedDatasetPrototype>(speciesProto.MaleFirstNames));
return _random.Pick(_prototypeManager.Index(speciesProto.MaleFirstNames));
else
return _random.Pick(_prototypeManager.Index<LocalizedDatasetPrototype>(speciesProto.FemaleFirstNames));
return _random.Pick(_prototypeManager.Index(speciesProto.FemaleFirstNames));
}
}
public string GetLastName(SpeciesPrototype speciesProto)
{
return _random.Pick(_prototypeManager.Index<LocalizedDatasetPrototype>(speciesProto.LastNames));
return _random.Pick(_prototypeManager.Index(speciesProto.LastNames));
}
}
}