Implement projected drone merging

2010-11-04 20:59:16 +01:00
parent 3f161f6c5d
commit 71ceb5a05c
2 changed files with 48 additions and 2 deletions
--- a/service/fit.py
+++ b/service/fit.py
@@ -321,7 +321,7 @@ class Fit(object):
        else:
            return False

-    def mergeDrones(self, fitID, d1, d2):
+    def mergeDrones(self, fitID, d1, d2, projected=False):
        if fitID == None:
            return False

@@ -329,7 +329,11 @@ class Fit(object):
        if d1.item != d2.item:
            return False

-        fit.drones.remove(d1)
+        if projected:
+            fit.projectedDrones.remove(d1)
+        else:
+            fit.drones.remove(d1)
+
        d2.amount += d1.amount
        d2.amountActive += d1.amountActive if d1.amountActive > 0 else -d2.amountActive
        eos.db.commit()