(a21f15055) Merge branch 'dev' into human-ai

This commit is contained in:
Joonas Rikkonen
2019-05-16 05:27:17 +03:00
parent 78b1d8ef8d
commit 8621d9927e
21 changed files with 207 additions and 248 deletions
@@ -729,6 +729,8 @@ namespace Barotrauma
partial void LoadAttachmentSprites();
// TODO: change the formula so that it's not linear and so that it takes into account the usefulness of the skill
// -> give a weight to each skill, because some are much more valuable than others?
private int CalculateSalary()
{
if (Name == null || Job == null) return 0;