(3d327d975) Merge branch 'dev' into human-ai

This commit is contained in:
Joonas Rikkonen
2019-05-16 06:01:53 +03:00
parent 3dc82efdbd
commit d70c463f41
16 changed files with 548 additions and 157 deletions
@@ -29,7 +29,7 @@ namespace Barotrauma
protected override IEnumerable<Character> GetList() => Character.CharacterList;
protected override AIObjective ObjectiveConstructor(Character target) => new AIObjectiveCombat(character, target, AIObjectiveCombat.CombatMode.Offensive, objectiveManager, PriorityModifier) { useCoolDown = false };
protected override AIObjective ObjectiveConstructor(Character target) => new AIObjectiveCombat(character, target, AIObjectiveCombat.CombatMode.Offensive, objectiveManager, PriorityModifier);
protected override float TargetEvaluation()
{