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

Merge branch 'master' into fix-syntax-warnings

Browse Source
This commit is contained in:
Anton Vorobyov
2024-11-27 23:37:50 +01:00
committed by GitHub
parent 954a164922 08d4e852d3
commit 45f0743c57
530 changed files with 104471 additions and 23536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
service/ammo.py
View File

@@ -69,7 +69,7 @@ class Ammo:
falloff = (mod.item.getAttribute('falloff') or 0) * \
(charge.getAttribute('fallofMultiplier') or 1)
for type_ in DmgTypes.names():
d = charge.getAttribute('%sDamage' % type_)
d = charge.getAttribute('%sDamage' % type_, default=0)
if d > 0:
damage += d
# Take optimal and falloff as range factor

24
service/conversions/releaseSep2024.py Normal file
View File

@@ -0,0 +1,24 @@
CONVERSIONS = {
# Renamed items
"Large Rudimentary Concussion Bomb I": "'Concussion' Compact Large Graviton Smartbomb",
"Small Rudimentary Concussion Bomb I": "'Concussion' Compact Small Graviton Smartbomb",
"Large 'Vehemence' Shockwave Charge": "'Vehemence' Compact Large EMP Smartbomb",
"Small 'Vehemence' Shockwave Charge": "'Vehemence' Compact Small EMP Smartbomb",
"Medium Rudimentary Concussion Bomb I": "'Concussion' Compact Medium Graviton Smartbomb",
"Medium 'Vehemence' Shockwave Charge": "'Vehemence' Compact Medium EMP Smartbomb",
"Small 'Notos' Explosive Charge I": "'Notos' Compact Small Proton Smartbomb",
"Medium 'Notos' Explosive Charge I": "'Notos' Compact Medium Proton Smartbomb",
"Large 'Notos' Explosive Charge I": "'Notos' Compact Large Proton Smartbomb",
"Small YF-12a Smartbomb": "'YF-12a' Compact Small Plasma Smartbomb",
"Medium YF-12a Smartbomb": "'YF-12a' Compact Medium Plasma Smartbomb",
"Large YF-12a Smartbomb": "'YF-12a' Compact Large Plasma Smartbomb",
"Small Degenerative Concussion Bomb I": "'Degenerative' Small Proton Smartbomb",
"Small Degenerative Concussion Bomb I Blueprint": "'Degenerative' Small Proton Smartbomb Blueprint",
"Medium Degenerative Concussion Bomb I": "'Dwindling' Medium Proton Smartbomb",
"Medium Degenerative Concussion Bomb I Blueprint": "'Dwindling' Medium Proton Smartbomb Blueprint",
"Large Degenerative Concussion Bomb I": "'Regressive' Large Proton Smartbomb",
"Large Degenerative Concussion Bomb I Blueprint": "'Regressive' Large Proton Smartbomb Blueprint",
"'Pike' Small EMP Smartbomb I": "'Pike' Small EMP Smartbomb",
"'Lance' Medium EMP Smartbomb I": "'Lance' Medium EMP Smartbomb",
"'Warhammer' Large EMP Smartbomb I": "'Warhammer' Large EMP Smartbomb",
}

3
service/market.py
View File

@@ -324,6 +324,9 @@ class Market:
"Metamorphosis" : self.les_grp, # Seems to be anniversary gift
"Shapash" : self.les_grp, # AT19 prize
"Cybele" : self.les_grp, # AT19 prize
"Sidewinder" : self.les_grp, # AT20 prize
"Cobra" : self.les_grp, # AT20 prize
"Python" : self.les_grp, # AT20 prize
}
self.ITEMS_FORCEGROUP_R = self.__makeRevDict(self.ITEMS_FORCEGROUP)

3
service/port/efs.py
View File

@@ -423,7 +423,8 @@ class EfsPort:
else:
maxRange = stats.maxRange
dps_spread_dict = stats.getDps(spoolOptions=spoolOptions, getSpreadDPS=True)
dps = stats.getDps(spoolOptions=spoolOptions)
dps_spread_dict = {'em': dps.em, 'therm': dps.thermal, 'kin': dps.kinetic, 'exp': dps.explosive, 'pure': dps.pure}
dps_spread_dict.update((x, y*n) for x, y in dps_spread_dict.items())
statDict = {

6
service/port/eft.py
View File

@@ -176,7 +176,11 @@ def exportDrones(drones, exportMutants=True, mutaData=None, standAlone=True):
return drone.item.typeName
def droneSorter(drone):
groupName = Market.getInstance().getMarketGroupByItem(drone.item).marketGroupName
if drone.isMutated:
item = drone.baseItem
else:
item = drone.item
groupName = Market.getInstance().getMarketGroupByItem(item).marketGroupName
return (DRONE_ORDER.index(groupName), drone.isMutated, drone.fullName)
if mutaData is None: