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

Unstable 0.17.0.0

Browse Source
This commit is contained in:
Markus Isberg
2022-02-26 02:43:01 +09:00
parent a83f375681
commit 3974067915
913 changed files with 32472 additions and 32364 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/Characters/Jobs/Job.cs
+39 -50
View File
@@ -9,87 +9,87 @@ namespace Barotrauma
{
private readonly JobPrefab prefab;
private readonly Dictionary<string, Skill> skills;
private readonly Dictionary<Identifier, Skill> skills;
public string Name
{
get { return prefab.Name; }
}
public LocalizedString Name => prefab.Name;
public string Description
{
get { return prefab.Description; }
}
public LocalizedString Description => prefab.Description;
public JobPrefab Prefab
{
get { return prefab; }
}
public List<Skill> Skills
{
get { return skills.Values.ToList(); }
}
public JobPrefab Prefab => prefab;
public List<Skill> Skills => skills.Values.ToList();
public int Variant;
public Skill PrimarySkill { get; }
public Job(JobPrefab jobPrefab, Rand.RandSync randSync = Rand.RandSync.Unsynced, int variant = 0)
public Job(JobPrefab jobPrefab) : this(jobPrefab, randSync: Rand.RandSync.Unsynced, variant: 0) { }
public Job(JobPrefab jobPrefab, Rand.RandSync randSync, int variant, params Skill[] s)
{
prefab = jobPrefab;
Variant = variant;
skills = new Dictionary<string, Skill>();
skills = new Dictionary<Identifier, Skill>();
foreach (var skill in s) { skills.Add(skill.Identifier, skill); }
foreach (SkillPrefab skillPrefab in prefab.Skills)
{
var skill = new Skill(skillPrefab, randSync);
skills.Add(skillPrefab.Identifier, skill);
Skill skill;
if (skills.ContainsKey(skillPrefab.Identifier))
{
skill = skills[skillPrefab.Identifier];
skills[skillPrefab.Identifier] = new Skill(skill.Identifier, skill.Level);
}
else
{
skill = new Skill(skillPrefab, randSync);
skills.Add(skillPrefab.Identifier, skill);
}
if (skillPrefab.IsPrimarySkill) { PrimarySkill = skill; }
}
}
public Job(XElement element)
{
string identifier = element.GetAttributeString("identifier", "").ToLowerInvariant();
Identifier identifier = element.GetAttributeIdentifier("identifier", "");
JobPrefab p;
if (!JobPrefab.Prefabs.ContainsKey(identifier))
{
DebugConsole.ThrowError($"Could not find the job {identifier}. Giving the character a random job.");
p = JobPrefab.Random();
p = JobPrefab.Random(Rand.RandSync.Unsynced);
}
else
{
p = JobPrefab.Prefabs[identifier];
}
prefab = p;
skills = new Dictionary<string, Skill>();
foreach (XElement subElement in element.Elements())
skills = new Dictionary<Identifier, Skill>();
foreach (var subElement in element.Elements())
{
if (!subElement.Name.ToString().Equals("skill", System.StringComparison.OrdinalIgnoreCase)) { continue; }
string skillIdentifier = subElement.GetAttributeString("identifier", "");
if (string.IsNullOrEmpty(skillIdentifier)) { continue; }
if (subElement.NameAsIdentifier() != "skill") { continue; }
Identifier skillIdentifier = subElement.GetAttributeIdentifier("identifier", "");
if (skillIdentifier.IsEmpty) { continue; }
var skill = new Skill(skillIdentifier, subElement.GetAttributeFloat("level", 0));
skills.Add(skillIdentifier, skill);
if (skillIdentifier == prefab.PrimarySkill?.Identifier) { PrimarySkill = skill; }
}
}
public static Job Random(Rand.RandSync randSync = Rand.RandSync.Unsynced)
public static Job Random(Rand.RandSync randSync)
{
var prefab = JobPrefab.Random(randSync);
var variant = Rand.Range(0, prefab.Variants, randSync);
return new Job(prefab, randSync, variant);
}
public float GetSkillLevel(string skillIdentifier)
public float GetSkillLevel(Identifier skillIdentifier)
{
if (string.IsNullOrWhiteSpace(skillIdentifier)) { return 0.0f; }
if (skillIdentifier.IsEmpty) { return 0.0f; }
skills.TryGetValue(skillIdentifier, out Skill skill);
return (skill == null) ? 0.0f : skill.Level;
return skill?.Level ?? 0.0f;
}
public void IncreaseSkillLevel(string skillIdentifier, float increase, bool increasePastMax)
public void IncreaseSkillLevel(Identifier skillIdentifier, float increase, bool increasePastMax)
{
if (skills.TryGetValue(skillIdentifier, out Skill skill))
{
@@ -130,7 +130,7 @@ namespace Barotrauma
else
{
string itemIdentifier = itemElement.GetAttributeString("identifier", "");
itemPrefab = MapEntityPrefab.Find(null, itemIdentifier) as ItemPrefab;
itemPrefab = MapEntityPrefab.FindByIdentifier(itemIdentifier.ToIdentifier()) as ItemPrefab;
if (itemPrefab == null)
{
DebugConsole.ThrowError("Tried to spawn \"" + Name + "\" with the item \"" + itemIdentifier + "\". Matching item prefab not found.");
@@ -192,27 +192,16 @@ namespace Barotrauma
if (item.Prefab.Identifier == "idcard")
{
if (spawnPoint != null)
{
foreach (string s in spawnPoint.IdCardTags)
{
item.AddTag(s);
if (!string.IsNullOrWhiteSpace(spawnPoint.IdCardDesc)) { item.Description = spawnPoint.IdCardDesc; }
}
}
item.AddTag("name:" + character.Name);
item.AddTag("job:" + Name);
IdCard idCardComponent = item.GetComponent<IdCard>();
idCardComponent?.Initialize(character.Info);
idCardComponent?.Initialize(spawnPoint, character);
}
foreach (WifiComponent wifiComponent in item.GetComponents<WifiComponent>())
{
wifiComponent.TeamID = character.TeamID;
}
if (parentItem != null) parentItem.Combine(item, user: null);
if (parentItem != null) { parentItem.Combine(item, user: null); }
foreach (XElement childItemElement in itemElement.Elements())
{
@@ -227,7 +216,7 @@ namespace Barotrauma
jobElement.Add(new XAttribute("name", Name));
jobElement.Add(new XAttribute("identifier", prefab.Identifier));
foreach (KeyValuePair<string, Skill> skill in skills)
foreach (KeyValuePair<Identifier, Skill> skill in skills)
{
jobElement.Add(new XElement("skill", new XAttribute("identifier", skill.Value.Identifier), new XAttribute("level", skill.Value.Level)));
}