From 3e2053b2dd13f1325fbe5f3165b9daa5365f3483 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Sat, 14 Feb 2015 01:27:52 -0500 Subject: [PATCH] Update 862583 sans database --- eos/effects/modeagilitypostdiv.py | 2 +- eos/effects/modearmorresonancepostdiv.py | 2 +- eos/effects/modemwdsigradiuspostdiv.py | 9 +++++++++ eos/effects/modeshieldresonancepostdiv.py | 15 +++++++++++++++ eos/effects/modesigradiuspostdiv.py | 2 +- eos/effects/modevelocitypostdiv.py | 2 +- ...launchercpupercentbonustacticaldestroyer.py | 2 +- ...apacitortransmitterpowerneedbonuseffect.py} | 2 +- ...shipheatdamageminmatartacticaldestroyer3.py | 9 +++++++++ eos/effects/shipmodemaxtargetrangepostdiv.py | 2 +- eos/effects/shipmodescanrespostdiv.py | 2 +- eos/effects/shipmodescanstrengthpostdiv.py | 2 +- eos/effects/shipmodesetoptimalrangepostdiv.py | 2 +- eos/effects/shipmodespttrackingpostdiv.py | 9 +++++++++ .../shipsptdamageminmatartacticaldestroyer1.py | 9 +++++++++ ...shipsptoptimalminmatartacticaldestroyer2.py | 9 +++++++++ service/conversions/releaseTiamat.py | 17 +++++++++++++++++ service/market.py | 1 + staticdata/icons/ships/34562.png | Bin 0 -> 2388 bytes 19 files changed, 88 insertions(+), 10 deletions(-) create mode 100644 eos/effects/modemwdsigradiuspostdiv.py create mode 100644 eos/effects/modeshieldresonancepostdiv.py rename eos/effects/{energytransferpowerneedbonuseffect.py => remotecapacitortransmitterpowerneedbonuseffect.py} (86%) create mode 100644 eos/effects/shipheatdamageminmatartacticaldestroyer3.py create mode 100644 eos/effects/shipmodespttrackingpostdiv.py create mode 100644 eos/effects/shipsptdamageminmatartacticaldestroyer1.py create mode 100644 eos/effects/shipsptoptimalminmatartacticaldestroyer2.py create mode 100644 service/conversions/releaseTiamat.py create mode 100644 staticdata/icons/ships/34562.png diff --git a/eos/effects/modeagilitypostdiv.py b/eos/effects/modeagilitypostdiv.py index 022951098..5faa5728e 100644 --- a/eos/effects/modeagilitypostdiv.py +++ b/eos/effects/modeagilitypostdiv.py @@ -1,7 +1,7 @@ # modeAgilityPostDiv # # Used by: -# Module: Amarr Tactical Destroyer Propulsion Mode +# Modules named like: Propulsion Mode (2 of 2) type = "passive" def handler(fit, module, context): fit.ship.multiplyItemAttr("agility", 1/module.getModifiedItemAttr("modeAgilityPostDiv"), diff --git a/eos/effects/modearmorresonancepostdiv.py b/eos/effects/modearmorresonancepostdiv.py index af767b63b..676bdb0fa 100644 --- a/eos/effects/modearmorresonancepostdiv.py +++ b/eos/effects/modearmorresonancepostdiv.py @@ -1,7 +1,7 @@ # modeArmorResonancePostDiv # # Used by: -# Module: Amarr Tactical Destroyer Defense Mode +# Modules named like: Defense Mode (2 of 2) type = "passive" def handler(fit, module, context): for resType in ("Em", "Explosive", "Kinetic"): diff --git a/eos/effects/modemwdsigradiuspostdiv.py b/eos/effects/modemwdsigradiuspostdiv.py new file mode 100644 index 000000000..7ebdf6ce1 --- /dev/null +++ b/eos/effects/modemwdsigradiuspostdiv.py @@ -0,0 +1,9 @@ +# modeMWDSigRadiusPostDiv +# +# Used by: +# Module: Svipul Defense Mode +type = "passive" +def handler(fit, module, context): + fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"), + "signatureRadiusBonus", 1/module.getModifiedItemAttr("modeMWDSigPenaltyPostDiv"), + stackingPenalties = True, penaltyGroup="postDiv") \ No newline at end of file diff --git a/eos/effects/modeshieldresonancepostdiv.py b/eos/effects/modeshieldresonancepostdiv.py new file mode 100644 index 000000000..5186ac28a --- /dev/null +++ b/eos/effects/modeshieldresonancepostdiv.py @@ -0,0 +1,15 @@ +# modeShieldResonancePostDiv +# +# Used by: +# Module: Svipul Defense Mode +type = "passive" +def handler(fit, module, context): + for resType in ("Em", "Explosive", "Kinetic"): + fit.ship.multiplyItemAttr("shield{0}DamageResonance".format(resType), + 1/module.getModifiedItemAttr("mode{0}ResistancePostDiv".format(resType)), + stackingPenalties = True, penaltyGroup="postDiv") + + # Thermal != Thermic + fit.ship.multiplyItemAttr("shieldThermalDamageResonance", + 1/module.getModifiedItemAttr("modeThermicResistancePostDiv"), + stackingPenalties = True, penaltyGroup="postDiv") diff --git a/eos/effects/modesigradiuspostdiv.py b/eos/effects/modesigradiuspostdiv.py index 72e955f73..c404686fb 100644 --- a/eos/effects/modesigradiuspostdiv.py +++ b/eos/effects/modesigradiuspostdiv.py @@ -1,7 +1,7 @@ # modeSigRadiusPostDiv # # Used by: -# Module: Amarr Tactical Destroyer Defense Mode +# Module: Confessor Defense Mode type = "passive" def handler(fit, module, context): level = fit.character.getSkill("Minmatar Destroyer").level diff --git a/eos/effects/modevelocitypostdiv.py b/eos/effects/modevelocitypostdiv.py index a38c9ddb8..33b4d53f0 100644 --- a/eos/effects/modevelocitypostdiv.py +++ b/eos/effects/modevelocitypostdiv.py @@ -1,7 +1,7 @@ # modeVelocityPostDiv # # Used by: -# Module: Amarr Tactical Destroyer Propulsion Mode +# Modules named like: Propulsion Mode (2 of 2) type = "passive" def handler(fit, module, context): fit.ship.multiplyItemAttr("maxVelocity", 1/module.getModifiedItemAttr("modeVelocityPostDiv"), diff --git a/eos/effects/probelaunchercpupercentbonustacticaldestroyer.py b/eos/effects/probelaunchercpupercentbonustacticaldestroyer.py index 1efb4913c..808c13098 100644 --- a/eos/effects/probelaunchercpupercentbonustacticaldestroyer.py +++ b/eos/effects/probelaunchercpupercentbonustacticaldestroyer.py @@ -1,7 +1,7 @@ # probeLauncherCPUPercentBonusTacticalDestroyer # # Used by: -# Ship: Confessor +# Ships from group: Tactical Destroyer (2 of 2) type = "passive" def handler(fit, ship, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Astrometrics"), diff --git a/eos/effects/energytransferpowerneedbonuseffect.py b/eos/effects/remotecapacitortransmitterpowerneedbonuseffect.py similarity index 86% rename from eos/effects/energytransferpowerneedbonuseffect.py rename to eos/effects/remotecapacitortransmitterpowerneedbonuseffect.py index e40ba2002..b55a1c8b1 100644 --- a/eos/effects/energytransferpowerneedbonuseffect.py +++ b/eos/effects/remotecapacitortransmitterpowerneedbonuseffect.py @@ -1,4 +1,4 @@ -# energyTransferPowerNeedBonusEffect +# remoteCapacitorTransmitterPowerNeedBonusEffect # # Used by: # Ships from group: Logistics (3 of 5) diff --git a/eos/effects/shipheatdamageminmatartacticaldestroyer3.py b/eos/effects/shipheatdamageminmatartacticaldestroyer3.py new file mode 100644 index 000000000..13607c1fa --- /dev/null +++ b/eos/effects/shipheatdamageminmatartacticaldestroyer3.py @@ -0,0 +1,9 @@ +# shipHeatDamageMinmatarTacticalDestroyer3 +# +# Used by: +# Ship: Svipul +type = "passive" +def handler(fit, ship, context): + level = fit.character.getSkill("Minmatar Tactical Destroyer").level + fit.modules.filteredItemBoost(lambda mod: True, "heatDamage", + ship.getModifiedItemAttr("shipBonusTacticalDestroyerMinmatar3") * level) diff --git a/eos/effects/shipmodemaxtargetrangepostdiv.py b/eos/effects/shipmodemaxtargetrangepostdiv.py index d9cb50254..dc270213c 100644 --- a/eos/effects/shipmodemaxtargetrangepostdiv.py +++ b/eos/effects/shipmodemaxtargetrangepostdiv.py @@ -1,7 +1,7 @@ # shipModeMaxTargetRangePostDiv # # Used by: -# Module: Amarr Tactical Destroyer Sharpshooter Mode +# Modules named like: Sharpshooter Mode (2 of 2) type = "passive" def handler(fit, module, context): fit.ship.multiplyItemAttr("maxTargetRange", 1/module.getModifiedItemAttr("modeMaxTargetRangePostDiv"), diff --git a/eos/effects/shipmodescanrespostdiv.py b/eos/effects/shipmodescanrespostdiv.py index 07db84ad5..b786e14c5 100644 --- a/eos/effects/shipmodescanrespostdiv.py +++ b/eos/effects/shipmodescanrespostdiv.py @@ -1,7 +1,7 @@ # shipModeScanResPostDiv # # Used by: -# Module: Amarr Tactical Destroyer Sharpshooter Mode +# Modules named like: Sharpshooter Mode (2 of 2) type = "passive" def handler(fit, module, context): fit.ship.multiplyItemAttr("scanResolution", 1/module.getModifiedItemAttr("modeScanResPostDiv"), diff --git a/eos/effects/shipmodescanstrengthpostdiv.py b/eos/effects/shipmodescanstrengthpostdiv.py index cdf2b20f3..a8a4a3750 100644 --- a/eos/effects/shipmodescanstrengthpostdiv.py +++ b/eos/effects/shipmodescanstrengthpostdiv.py @@ -1,7 +1,7 @@ # shipModeScanStrengthPostDiv # # Used by: -# Module: Amarr Tactical Destroyer Sharpshooter Mode +# Modules named like: Sharpshooter Mode (2 of 2) type = "passive" def handler(fit, module, context): fit.ship.multiplyItemAttr("scanRadarStrength", 1/module.getModifiedItemAttr("modeRadarStrengthPostDiv"), diff --git a/eos/effects/shipmodesetoptimalrangepostdiv.py b/eos/effects/shipmodesetoptimalrangepostdiv.py index bafceea86..2913a7a73 100644 --- a/eos/effects/shipmodesetoptimalrangepostdiv.py +++ b/eos/effects/shipmodesetoptimalrangepostdiv.py @@ -1,7 +1,7 @@ # shipModeSETOptimalRangePostDiv # # Used by: -# Module: Amarr Tactical Destroyer Sharpshooter Mode +# Module: Confessor Sharpshooter Mode type = "passive" def handler(fit, module, context): fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Small Energy Turret"), diff --git a/eos/effects/shipmodespttrackingpostdiv.py b/eos/effects/shipmodespttrackingpostdiv.py new file mode 100644 index 000000000..125d94990 --- /dev/null +++ b/eos/effects/shipmodespttrackingpostdiv.py @@ -0,0 +1,9 @@ +# shipModeSPTTrackingPostDiv +# +# Used by: +# Module: Svipul Sharpshooter Mode +type = "passive" +def handler(fit, module, context): + fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Small Projectile Turret"), + "trackingSpeed", 1/module.getModifiedItemAttr("modeTrackingPostDiv"), + stackingPenalties=True, penaltyGroup="postDiv") diff --git a/eos/effects/shipsptdamageminmatartacticaldestroyer1.py b/eos/effects/shipsptdamageminmatartacticaldestroyer1.py new file mode 100644 index 000000000..349767adf --- /dev/null +++ b/eos/effects/shipsptdamageminmatartacticaldestroyer1.py @@ -0,0 +1,9 @@ +# shipSPTDamageMinmatarTacticalDestroyer1 +# +# Used by: +# Ship: Svipul +type = "passive" +def handler(fit, ship, context): + level = fit.character.getSkill("Minmatar Tactical Destroyer").level + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"), + "damageMultiplier", ship.getModifiedItemAttr("shipBonusTacticalDestroyerMinmatar1") * level) diff --git a/eos/effects/shipsptoptimalminmatartacticaldestroyer2.py b/eos/effects/shipsptoptimalminmatartacticaldestroyer2.py new file mode 100644 index 000000000..da0ff3d12 --- /dev/null +++ b/eos/effects/shipsptoptimalminmatartacticaldestroyer2.py @@ -0,0 +1,9 @@ +# shipSPTOptimalMinmatarTacticalDestroyer2 +# +# Used by: +# Ship: Svipul +type = "passive" +def handler(fit, ship, context): + level = fit.character.getSkill("Minmatar Tactical Destroyer").level + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"), + "maxRange", ship.getModifiedItemAttr("shipBonusTacticalDestroyerMinmatar2") * level) diff --git a/service/conversions/releaseTiamat.py b/service/conversions/releaseTiamat.py new file mode 100644 index 000000000..5aed8669b --- /dev/null +++ b/service/conversions/releaseTiamat.py @@ -0,0 +1,17 @@ +""" +Conversion pack for Tiamat Module Tiericide +""" + +CONVERSIONS = { + "Enduring Cargo Scanner": "Type-E Enduring Cargo Scanner", + "Scoped Cargo Scanner": "PL-0 Scoped Cargo Scanner", + "Compact Ship Scanner": "Ta3 Compact Ship Scanner", + "Scoped Survey Scanner": "ML-3 Scoped Survey Scanner", + "Compact Light Missile Launcher": "Arbalest Compact Light Missile Launcher", + "Ample Light Missile Launcher": "TE-2100 Ample Light Missile Launcher", + "Compact Capacitor Flux Coil": "Mark I Compact Capacitor Flux Coil", + "Restrained Capacitor Flux Coil": "Type-D Restrained Capacitor Flux Coil", + "Compact Reactor Control Unit": "Mark I Compact Reactor Control Unit", + "Upgraded Co-Processor": "Photonic Upgraded Co-Processor", + "Compact Micro Auxiliary Power Core": "Vigor Compact Micro Auxiliary Power Core" +} diff --git a/service/market.py b/service/market.py index f7b4b2666..3df36aec7 100644 --- a/service/market.py +++ b/service/market.py @@ -227,6 +227,7 @@ class Market(): u"\u6bd2\u8725\u7ea7YC117\u5e74\u7279\u522b\u7248": False, u"\u4f0a\u4ec0\u5854\u7ea7YC117\u5e74\u7279\u522b\u7248": False, u"\u94f6\u9e70\u7ea7YC117\u5e74\u7279\u522b\u7248": False, + "Council Diplomatic Shuttle": False, # Not sure yet } # do not publish ships that we convert diff --git a/staticdata/icons/ships/34562.png b/staticdata/icons/ships/34562.png new file mode 100644 index 0000000000000000000000000000000000000000..56b777b7167345c69e0fe2b6d22474c64d150c70 GIT binary patch literal 2388 zcmV-a39I&rP)004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00006 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