dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 10 Wiki Activity

Merge branch 'development' into PreferencesPaneV2

Browse Source
This commit is contained in:
Ebag333
2017-02-26 11:22:10 -08:00
committed by GitHub
parent fbf35edae2 1826122381
commit dc6cde86c9
16 changed files with 560 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
service/fit.py
View File

@@ -688,7 +688,7 @@ class Fit(object):
self.recalc(fit)
return True
def addDrone(self, fitID, itemID):
def addDrone(self, fitID, itemID, numDronesToAdd=1):
if fitID is None:
return False
@@ -707,7 +707,7 @@ class Fit(object):
fit.drones.append(drone)
else:
return False
drone.amount += 1
drone.amount += numDronesToAdd
eos.db.commit()
self.recalc(fit)
return True

44
service/market.py
View File

@@ -590,7 +590,40 @@ class Market(object):
parents = set()
# Set-container for variables
variations = set()
variations_limiter = set()
for item in items:
if item.category.ID == 20: # Implants and Boosters
implant_remove_list = set()
implant_remove_list.add("Low-Grade ")
implant_remove_list.add("Low-grade ")
implant_remove_list.add("Mid-Grade ")
implant_remove_list.add("Mid-grade ")
implant_remove_list.add("High-Grade ")
implant_remove_list.add("High-grade ")
implant_remove_list.add("Limited ")
implant_remove_list.add(" - Advanced")
implant_remove_list.add(" - Basic")
implant_remove_list.add(" - Elite")
implant_remove_list.add(" - Improved")
implant_remove_list.add(" - Standard")
implant_remove_list.add("Copper ")
implant_remove_list.add("Gold ")
implant_remove_list.add("Silver ")
implant_remove_list.add("Advanced ")
implant_remove_list.add("Improved ")
implant_remove_list.add("Prototype ")
implant_remove_list.add("Standard ")
implant_remove_list.add("Strong ")
implant_remove_list.add("Synth ")
for implant_prefix in ("-6", "-7", "-8", "-9", "-10"):
for i in range(50):
implant_remove_list.add(implant_prefix + str("%02d" % i))
for text_to_remove in implant_remove_list:
if text_to_remove in item.name:
variations_limiter.add(item.name.replace(text_to_remove, ""))
# Get parent item
if alreadyparent is False:
parent = self.getParentItemByItem(item)
@@ -608,7 +641,16 @@ class Market(object):
variations.update(parents)
# Add all variations of parents to the set
parentids = tuple(item.ID for item in parents)
variations.update(eos.db.getVariations(parentids))
groupids = tuple(item.group.ID for item in parents)
variations_list = eos.db.getVariations(parentids, groupids)
if variations_limiter:
for limit in variations_limiter:
trimmed_variations_list = [variation_item for variation_item in variations_list if limit in variation_item.name]
if trimmed_variations_list:
variations_list = trimmed_variations_list
variations.update(variations_list)
return variations
def getGroupsByCategory(self, cat):