diff --git a/Rapier - 1 TP 1 Web Rapier w hml.xml b/Rapier - 1 TP 1 Web Rapier w hml.xml new file mode 100644 index 000000000..9ba601692 --- /dev/null +++ b/Rapier - 1 TP 1 Web Rapier w hml.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/effs_stat_export.py b/effs_stat_export.py index 411fdbb86..4acc6b233 100755 --- a/effs_stat_export.py +++ b/effs_stat_export.py @@ -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: diff --git a/eos/events.py b/eos/events.py index de8bdfadb..eabdf0b7e 100644 --- a/eos/events.py +++ b/eos/events.py @@ -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() diff --git a/shipBaseJSON.js b/shipBaseJSON.js new file mode 100644 index 000000000..28b7228b2 --- /dev/null +++ b/shipBaseJSON.js @@ -0,0 +1,2 @@ +let shipBaseJSON = JSON.stringify([]); +export {shipBaseJSON}; \ No newline at end of file diff --git a/shipJSON.js b/shipJSON.js new file mode 100644 index 000000000..22c2ed09f --- /dev/null +++ b/shipJSON.js @@ -0,0 +1,2 @@ +let shipJSON = JSON.stringify([]); +export {shipJSON}; \ No newline at end of file