Update to 871030 SISI, also fix prep_data script for changes in Phobo…

…s / reverence

eos/effects/shipbonusheavydronearmorhpgc2.py

@@ -0,0 +1,5 @@
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Gallente Cruiser").level
+    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"),
+                                 "armorHP", ship.getModifiedItemAttr("shipBonusGC2") * level)

eos/effects/shipbonusheavydronedamagemultipliergc2.py

@@ -0,0 +1,5 @@
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Gallente Cruiser").level
+    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"),
+                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusGC2") * level)

eos/effects/shipbonusheavydronehpgc2.py

@@ -0,0 +1,5 @@
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Gallente Cruiser").level
+    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"),
+                                 "hp", ship.getModifiedItemAttr("shipBonusGC2") * level)

eos/effects/shipbonusheavydroneshieldhpgc2.py

@@ -0,0 +1,5 @@
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Gallente Cruiser").level
+    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"),
+                                 "shieldCapacity", ship.getModifiedItemAttr("shipBonusGC2") * level)

eos/effects/shipbonuslightdronearmorhpgc2.py

@@ -0,0 +1,5 @@
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Gallente Cruiser").level
+    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Light Drone Operation"),
+                                 "armorHP", ship.getModifiedItemAttr("shipBonusGC2") * level)

eos/effects/shipbonuslightdronedamagemultipliergc2.py

@@ -0,0 +1,5 @@
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Gallente Cruiser").level
+    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Light Drone Operation"),
+                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusGC2") * level)

eos/effects/shipbonuslightdronehpgc2.py

@@ -0,0 +1,5 @@
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Gallente Cruiser").level
+    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Light Drone Operation"),
+                                 "hp", ship.getModifiedItemAttr("shipBonusGC2") * level)

eos/effects/shipbonuslightdroneshieldhpgc2.py

@@ -0,0 +1,5 @@
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Gallente Cruiser").level
+    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Light Drone Operation"),
+                                 "shieldCapacity", ship.getModifiedItemAttr("shipBonusGC2") * level)

eos/effects/shipbonusmediumdronearmorhpgc2.py

@@ -0,0 +1,5 @@
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Gallente Cruiser").level
+    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Medium Drone Operation"),
+                                 "armorHP", ship.getModifiedItemAttr("shipBonusGC2") * level)

eos/effects/shipbonusmediumdronedamagemultipliergc2.py

@@ -0,0 +1,5 @@
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Gallente Cruiser").level
+    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Medium Drone Operation"),
+                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusGC2") * level)

eos/effects/shipbonusmediumdronehpgc2.py

@@ -0,0 +1,5 @@
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Gallente Cruiser").level
+    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Medium Drone Operation"),
+                                 "hp", ship.getModifiedItemAttr("shipBonusGC2") * level)

eos/effects/shipbonusmediumdroneshieldhpgc2.py

@@ -0,0 +1,5 @@
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Gallente Cruiser").level
+    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Medium Drone Operation"),
+                                 "shieldCapacity", ship.getModifiedItemAttr("shipBonusGC2") * level)

eos/effects/shipbonussentryarmorhpgc3.py

@@ -0,0 +1,5 @@
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Gallente Cruiser").level
+    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"),
+                                 "armorHP", ship.getModifiedItemAttr("shipBonusGC3") * level)

eos/effects/shipbonussentrydamagemultipliergc3.py

@@ -0,0 +1,5 @@
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Gallente Cruiser").level
+    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"),
+                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusGC3") * level)

eos/effects/shipbonussentryhpgc3.py

@@ -0,0 +1,5 @@
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Gallente Cruiser").level
+    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"),
+                                 "hp", ship.getModifiedItemAttr("shipBonusGC3") * level)

eos/effects/shipbonussentryshieldhpgc3.py

@@ -0,0 +1,5 @@
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Gallente Cruiser").level
+    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"),
+                                 "shieldCapacity", ship.getModifiedItemAttr("shipBonusGC3") * level)

eos/effects/subsystembonuscaldaridefensiveshieldrechargerate.py

@@ -0,0 +1,4 @@
+type = "passive"
+def handler(fit, module, context):
+    level = fit.character.getSkill("Caldari Defensive Systems").level
+    fit.ship.boostItemAttr("shieldRechargeRate", module.getModifiedItemAttr("subsystemBonusCaldariDefensive2") * level)

scripts/prep_data.py

@@ -11,6 +11,7 @@
 parser = argparse.ArgumentParser()
 parser.add_argument("-e", "--eve", dest="eve_path", help="Location of EVE directory", required=True)
 parser.add_argument("-c", "--cache", dest="cache_path", help="Location of EVE cache directory. If not specified, an attempt will be make to automatically determine path.")
+parser.add_argument("-r", "--res", dest="res_path", help="Location of EVE shared resource cache", required=True)
 parser.add_argument("-d", "--dump", dest="dump_path", help="Location of Phobos JSON dump directory", required=True)
 parser.add_argument("-p", "--phobos", dest="phb_path", help="Location of Phobos, defaults to path noted in script", default=phb_path)
 parser.add_argument("-s", "--singularity", action="store_true", help="Singularity build")
@@ -19,6 +20,7 @@
 args = parser.parse_args()
 eve_path = os.path.expanduser(unicode(args.eve_path, sys.getfilesystemencoding()))
 cache_path = os.path.expanduser(unicode(args.cache_path, sys.getfilesystemencoding())) if args.cache_path else None
+path_res = os.path.expanduser(unicode(args.res_path,  sys.getfilesystemencoding()))
 dump_path = os.path.expanduser(unicode(args.dump_path, sys.getfilesystemencoding()))
 script_path = os.path.dirname(unicode(__file__, sys.getfilesystemencoding()))
 
@@ -44,10 +46,10 @@ def header(text, subtext=None):
     from translator import Translator
     from writer import *
 
-    rvr = reverence.blue.EVE(eve_path, cachepath=args.cache_path, server="singularity" if args.singularity else "tranquility")
+    rvr = reverence.blue.EVE(eve_path, cachepath=args.cache_path, respath=path_res, server="singularity" if args.singularity else "tranquility")
 
-    spickle_miner = StuffedPickleMiner(rvr)
-    trans = Translator(spickle_miner)
+    pickle_miner = ResourcePickleMiner(rvr)
+    trans = Translator(pickle_miner)
     bulkdata_miner = BulkdataMiner(rvr, trans)
 
     miners = (
@@ -56,7 +58,7 @@ def header(text, subtext=None):
         TraitMiner(bulkdata_miner, trans),
         SqliteMiner(eve_path, trans),
         CachedCallsMiner(rvr, trans),
-        spickle_miner
+        pickle_miner
     )
 
     writers = (

service/market.py

@@ -190,7 +190,7 @@ def __init__(self):
             "Stratios Emergency Responder": self.les_grp, # Issued for Somer Blink lottery
             "Scorpion Ishukone Watch": self.les_grp, # Prize for offline events - fanfest PVP and poker tourneys
             "Miasmos Quafe Ultra Edition": self.les_grp, # Gift to people who purchased FF HD stream
-            "Interbus Shuttle": self.les_grp,
+            "InterBus Shuttle": self.les_grp,
             "Leopard": self.les_grp, # 2013 new year gift
             "Whiptail": self.les_grp, # AT12 prize
             "Chameleon": self.les_grp } # AT12 prize