Merge branch 'master' into moStuff
This commit is contained in:
@@ -454,7 +454,7 @@ namespace Barotrauma.Items.Components
|
||||
|
||||
float[] skillSuccess = new float[requiredSkills.Count];
|
||||
|
||||
for (int i = 0; i < requiredSkills.Count; i++ )
|
||||
for (int i = 0; i < requiredSkills.Count; i++)
|
||||
{
|
||||
int characterLevel = character.GetSkillLevel(requiredSkills[i].Name);
|
||||
|
||||
@@ -463,7 +463,7 @@ namespace Barotrauma.Items.Components
|
||||
|
||||
float average = skillSuccess.Average();
|
||||
|
||||
return (average+100.0f)/2.0f;
|
||||
return (average + 100.0f) / 2.0f;
|
||||
}
|
||||
|
||||
public virtual void FlipX() { }
|
||||
@@ -570,6 +570,7 @@ namespace Barotrauma.Items.Components
|
||||
case "requireditem":
|
||||
if (!overrideRequiredItems) requiredItems.Clear();
|
||||
overrideRequiredItems = true;
|
||||
|
||||
RelatedItem newRequiredItem = RelatedItem.Load(subElement);
|
||||
|
||||
if (newRequiredItem == null) continue;
|
||||
|
||||
Reference in New Issue
Block a user