vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

v0.19.0.0 (unstable)

Browse Source
This commit is contained in:
Regalis11
2022-07-20 18:47:07 +03:00
parent 2e2663a175
commit 6b55adcdd9
170 changed files with 2769 additions and 1634 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/Characters/CharacterInfo.cs
+44 -12
View File
@@ -261,6 +261,10 @@ namespace Barotrauma
public string Name;
public LocalizedString Title;
public (Identifier NpcSetIdentifier, Identifier NpcIdentifier) HumanPrefabIds;
public string DisplayName
{
get
@@ -649,15 +653,12 @@ namespace Barotrauma
{
Name = name;
}
else if (!npcIdentifier.IsEmpty && TextManager.Get("npctitle." + npcIdentifier) is { Loaded: true } npcTitle)
{
Name = npcTitle.Value;
}
else
{
Name = GetRandomName(randSync);
}
TryLoadNameAndTitle(npcIdentifier);
SetPersonalityTrait();
Salary = CalculateSalary();
@@ -727,7 +728,7 @@ namespace Barotrauma
}
// Used for loading the data
public CharacterInfo(XElement infoElement)
public CharacterInfo(XElement infoElement, Identifier npcIdentifier = default)
{
ID = idCounter;
idCounter++;
@@ -774,6 +775,8 @@ namespace Barotrauma
Head.FacialHairColor = infoElement.GetAttributeColor("facialhaircolor", Color.White);
CheckColors();
TryLoadNameAndTitle(npcIdentifier);
if (string.IsNullOrEmpty(Name))
{
var nameElement = CharacterConfigElement.GetChildElement("names");
@@ -794,9 +797,21 @@ namespace Barotrauma
ragdollFileName = infoElement.GetAttributeString("ragdoll", string.Empty);
if (personalityName != Identifier.Empty)
{
PersonalityTrait = NPCPersonalityTrait.Get(GameSettings.CurrentConfig.Language, personalityName);
if (NPCPersonalityTrait.Traits.TryGet(personalityName, out var trait) ||
NPCPersonalityTrait.Traits.TryGet(personalityName.Replace(" ".ToIdentifier(), Identifier.Empty), out trait))
{
PersonalityTrait = trait;
}
else
{
DebugConsole.ThrowError($"Error in CharacterInfo \"{OriginalName}\": could not find a personality trait with the identifier \"{personalityName}\".");
}
}
HumanPrefabIds = (
element.GetAttributeIdentifier("npcsetid", Identifier.Empty),
element.GetAttributeIdentifier("npcid", Identifier.Empty));
MissionsCompletedSinceDeath = infoElement.GetAttributeInt("missionscompletedsincedeath", 0);
foreach (var subElement in infoElement.Elements())
@@ -838,6 +853,19 @@ namespace Barotrauma
LoadHeadAttachments();
}
private void TryLoadNameAndTitle(Identifier npcIdentifier)
{
if (!npcIdentifier.IsEmpty)
{
Title = TextManager.Get("npctitle." + npcIdentifier);
string nameTag = "charactername." + npcIdentifier;
if (TextManager.ContainsTag(nameTag))
{
Name = TextManager.Get(nameTag).Value;
}
}
}
private List<ContentXElement> hairs;
public IReadOnlyList<ContentXElement> Hairs => hairs;
private List<ContentXElement> beards;
@@ -1292,9 +1320,16 @@ namespace Barotrauma
new XAttribute("facialhaircolor", XMLExtensions.ColorToString(Head.FacialHairColor)),
new XAttribute("startitemsgiven", StartItemsGiven),
new XAttribute("ragdoll", ragdollFileName),
new XAttribute("personality", PersonalityTrait?.Name.Value ?? ""));
new XAttribute("personality", PersonalityTrait?.Identifier ?? Identifier.Empty));
// TODO: animations?
if (HumanPrefabIds != default)
{
charElement.Add(
new XAttribute("npcsetid", HumanPrefabIds.NpcSetIdentifier),
new XAttribute("npcid", HumanPrefabIds.NpcIdentifier));
}
charElement.Add(new XAttribute("missionscompletedsincedeath", MissionsCompletedSinceDeath));
if (Character != null)
@@ -1323,11 +1358,8 @@ namespace Barotrauma
}
}
charElement.Add(savedStatElement);
parentElement.Add(charElement);
parentElement?.Add(charElement);
return charElement;
}