diff --git a/service/fit.py b/service/fit.py index 7fb0f7813..b2bb691ff 100644 --- a/service/fit.py +++ b/service/fit.py @@ -693,6 +693,25 @@ class Fit(object): ''' if fighter is None: fighter = eos.types.Fighter(item) + used = fit.getSlotsUsed(fighter.slot) + total = fit.getNumSlots(fighter.slot) + standardAttackActive = False; + for ability in fighter.abilities: + if (ability.effect.isImplemented and ability.effect.handlerName == u'fighterabilityattackm'): + # Activate "standard attack" if available + ability.active = True + standardAttackActive = True + else: + # Activate all other abilities (Neut, Web, etc) except propmods if no standard attack is active + if (ability.effect.isImplemented + and standardAttackActive == False + and ability.effect.handlerName != u'fighterabilitymicrowarpdrive' + and ability.effect.handlerName != u'fighterabilityevasivemaneuvers'): + ability.active = True + + if used >= total: + fighter.active = False + if fighter.fits(fit) is True: fit.fighters.append(fighter) else: