Adjusted effs fit name prefixing

This commit is contained in:
Maru Maru
2018-04-30 20:38:38 -04:00
parent 49b1e2ee36
commit acade56769
5 changed files with 36 additions and 5 deletions

View File

@@ -0,0 +1,25 @@
<?xml version="1.0" ?>
<fittings count="1">
<fitting name="1 TP 1 Web Rapier w hml">
<description value=""/>
<shipType value="Rapier"/>
<hardware slot="low slot 0" type="Damage Control II"/>
<hardware slot="low slot 1" type="Nanofiber Internal Structure II"/>
<hardware slot="low slot 2" type="Nanofiber Internal Structure II"/>
<hardware slot="low slot 3" type="Missile Guidance Enhancer II"/>
<hardware slot="med slot 0" type="50MN Cold-Gas Enduring Microwarpdrive"/>
<hardware slot="med slot 1" type="Adaptive Invulnerability Field II"/>
<hardware slot="med slot 2" type="Federation Navy Stasis Webifier"/>
<hardware slot="med slot 3" type="Republic Fleet Large Shield Extender"/>
<hardware slot="med slot 4" type="Republic Fleet Large Shield Extender"/>
<hardware slot="med slot 5" type="Republic Fleet Target Painter"/>
<hardware slot="hi slot 0" type="Covert Ops Cloaking Device II"/>
<hardware slot="hi slot 1" type="Heavy Missile Launcher II"/>
<hardware slot="hi slot 2" type="Heavy Missile Launcher II"/>
<hardware slot="hi slot 3" type="Heavy Missile Launcher II"/>
<hardware slot="rig slot 0" type="Medium Core Defense Field Extender II"/>
<hardware slot="rig slot 1" type="Medium Core Defense Field Extender II"/>
<hardware qty="3" slot="drone bay" type="Acolyte II"/>
<hardware qty="120" slot="cargo" type="Caldari Navy Scourge Heavy Missile"/>
</fitting>
</fittings>

View File

@@ -228,7 +228,9 @@ def parseNeededFitDetails(fit, groupID):
moduleNames = []
fitID = fit.ID
if len(fit.modules) > 0:
fit.name = fit.ship.name + ': ' + fit.name
fitName = fit.ship.name + ': ' + fit.name
else:
fitName = fit.name
print ''
print 'name: ' + fit.name
fitL = Fit()
@@ -611,10 +613,10 @@ def parseNeededFitDetails(fit, groupID):
elif groupID in [29, 1022]:
shipSize = shipSizes[7]
else:
shipSize = 'ShipSize not found for ' + fit.name + ' groupID: ' + str(groupID)
shipSize = 'ShipSize not found for ' + fitName + ' groupID: ' + str(groupID)
print shipSize
try:
parsable = {'name': fit.name, 'ehp': fit.ehp, 'droneDPS': fit.droneDPS, \
parsable = {'name': fitName, 'ehp': fit.ehp, 'droneDPS': fit.droneDPS, \
'droneVolley': fit.droneVolley, 'hp': fit.hp, 'maxTargets': fit.maxTargets, \
'maxSpeed': fit.maxSpeed, 'weaponVolley': fit.weaponVolley, 'totalVolley': fit.totalVolley,\
'maxTargetRange': fit.maxTargetRange, 'scanStrength': fit.scanStrength,\
@@ -634,7 +636,7 @@ def parseNeededFitDetails(fit, groupID):
except TypeError:
print 'Error parsing fit:' + str(fit)
print TypeError
parsable = {'name': fit.name + 'Fit could not be correctly parsed'}
parsable = {'name': fitName + 'Fit could not be correctly parsed'}
#print fit.ship.itemModifiedAttributes.items()
#help(fit)
#if len(fit.fighters) > 5:

View File

@@ -58,7 +58,7 @@ def rel_listener(target, value, initiator):
if not target or (isinstance(value, Module) and value.isEmpty):
return
print "{} has had a relationship change :D".format(target)
#print "{} has had a relationship change :D".format(target)
target.modified = datetime.datetime.now()

2
shipBaseJSON.js Normal file
View File

@@ -0,0 +1,2 @@
let shipBaseJSON = JSON.stringify([]);
export {shipBaseJSON};

2
shipJSON.js Normal file
View File

@@ -0,0 +1,2 @@
let shipJSON = JSON.stringify([]);
export {shipJSON};