From 5c039579bb74fe57e120061df3c8e2a5debdfd40 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Mon, 21 Nov 2011 21:22:20 +0400 Subject: [PATCH] Also create fleet automatically on booster assignments --- service/fleet.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/service/fleet.py b/service/fleet.py index 120689f38..f2b6d87aa 100644 --- a/service/fleet.py +++ b/service/fleet.py @@ -80,6 +80,9 @@ class Fleet(object): eos.db.save(f) def setLinearFleetCom(self, boostee, booster): + if self.isInLinearFleet(boostee) is False: + self.removeAssociatedFleetData(boostee) + self.makeLinearFleet(boostee) squadIDs = set(eos.db.getSquadsIDsWithFitID(boostee.ID)) squad = eos.db.getSquad(squadIDs.pop()) squad.wing.gang.leader = booster @@ -89,6 +92,9 @@ class Fleet(object): self.removeAssociatedFleetData(boostee) def setLinearWingCom(self, boostee, booster): + if self.isInLinearFleet(boostee) is False: + self.removeAssociatedFleetData(boostee) + self.makeLinearFleet(boostee) squadIDs = set(eos.db.getSquadsIDsWithFitID(boostee.ID)) squad = eos.db.getSquad(squadIDs.pop()) squad.wing.leader = booster @@ -98,6 +104,9 @@ class Fleet(object): self.removeAssociatedFleetData(boostee) def setLinearSquadCom(self, boostee, booster): + if self.isInLinearFleet(boostee) is False: + self.removeAssociatedFleetData(boostee) + self.makeLinearFleet(boostee) squadIDs = set(eos.db.getSquadsIDsWithFitID(boostee.ID)) squad = eos.db.getSquad(squadIDs.pop()) squad.leader = booster