diff --git a/config.py b/config.py index 4c4373259..99dfb1ed4 100644 --- a/config.py +++ b/config.py @@ -18,9 +18,9 @@ debug = False saveInRoot = False # Version data -version = "1.17.2" -tag = "git" -expansionName = "Frostline" +version = "1.18.0" +tag = "Stable" +expansionName = "YC 118.1" expansionVersion = "1.0" evemonMinVersion = "4081" diff --git a/eos/effects/covertopscloakcpupercentbonuspiratefaction.py b/eos/effects/covertopscloakcpupercentbonuspiratefaction.py index fa7faffc3..b4472ad84 100644 --- a/eos/effects/covertopscloakcpupercentbonuspiratefaction.py +++ b/eos/effects/covertopscloakcpupercentbonuspiratefaction.py @@ -1,8 +1,8 @@ # covertOpsCloakCPUPercentBonusPirateFaction # # Used by: +# Ships from group: Expedition Frigate (2 of 2) # Ship: Astero -# Ship: Prospect # Ship: Victorieux Luxury Yacht type = "passive" runTime = "early" diff --git a/eos/effects/gchyieldmultiplypassive.py b/eos/effects/gchyieldmultiplypassive.py index e8316ba16..a86312d50 100644 --- a/eos/effects/gchyieldmultiplypassive.py +++ b/eos/effects/gchyieldmultiplypassive.py @@ -1,7 +1,8 @@ # GCHYieldMultiplyPassive # # Used by: -# Variations of ship: Venture (2 of 2) +# Ship: Prospect +# Ship: Venture type = "passive" def handler(fit, module, context): fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Gas Cloud Harvester", diff --git a/eos/effects/miningyieldmultiplypassive.py b/eos/effects/miningyieldmultiplypassive.py index 8645a370f..3838c6e6f 100644 --- a/eos/effects/miningyieldmultiplypassive.py +++ b/eos/effects/miningyieldmultiplypassive.py @@ -1,10 +1,9 @@ # miningYieldMultiplyPassive # # Used by: -# Ships from group: Expedition Frigate (2 of 2) # Variations of ship: Procurer (2 of 2) # Variations of ship: Retriever (2 of 2) -# Ship: Venture +# Variations of ship: Venture (3 of 3) type = "passive" def handler(fit, module, context): fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Mining"), diff --git a/eos/effects/shipbonusenergynosfalloffab.py b/eos/effects/shipbonusenergynosoptimalab.py similarity index 50% rename from eos/effects/shipbonusenergynosfalloffab.py rename to eos/effects/shipbonusenergynosoptimalab.py index ddb664d92..07acffc22 100644 --- a/eos/effects/shipbonusenergynosfalloffab.py +++ b/eos/effects/shipbonusenergynosoptimalab.py @@ -1,7 +1,7 @@ -# shipBonusEnergyNosFalloffAB +# shipBonusEnergyNosOptimalAB # # Used by: # Ship: Armageddon type = "passive" def handler(fit, src, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "falloffEffectiveness", src.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship") + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "maxRange", src.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship") diff --git a/eos/effects/shipgchyieldbonusorefrig2.py b/eos/effects/shipgchyieldbonusorefrig2.py index d25ffdec2..ce9cdbe44 100644 --- a/eos/effects/shipgchyieldbonusorefrig2.py +++ b/eos/effects/shipgchyieldbonusorefrig2.py @@ -1,7 +1,8 @@ # shipGCHYieldBonusOREfrig2 # # Used by: -# Variations of ship: Venture (2 of 2) +# Ship: Prospect +# Ship: Venture type = "passive" def handler(fit, module, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Gas Cloud Harvester", diff --git a/eos/effects/shipminingbonusorefrig1.py b/eos/effects/shipminingbonusorefrig1.py index 54a33756c..c67495295 100644 --- a/eos/effects/shipminingbonusorefrig1.py +++ b/eos/effects/shipminingbonusorefrig1.py @@ -1,8 +1,7 @@ # shipMiningBonusOREfrig1 # # Used by: -# Ships from group: Expedition Frigate (2 of 2) -# Ship: Venture +# Variations of ship: Venture (3 of 3) type = "passive" def handler(fit, module, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining"), diff --git a/eve.db b/eve.db index 5a0dada1a..42767c066 100644 Binary files a/eve.db and b/eve.db differ diff --git a/service/conversions/releaseJan2016.py b/service/conversions/releaseJan2016.py new file mode 100644 index 000000000..e5f9beba3 --- /dev/null +++ b/service/conversions/releaseJan2016.py @@ -0,0 +1,13 @@ +""" +Conversion pack for January 2016 (YC118.1) release +""" + +CONVERSIONS = { + # Renamed items + "Micro' Remote Shield Booster": "'Micro' Remote Shield Booster", + "C-IR Compact Guidance Disruptor I": "C-IR Compact Guidance Disruptor", + "'Distributor' Guidance Disruptor I": "'Distributor' Guidance Disruptor", + "'Distributor' Guidance Disruptor I Blueprint": "'Distributor' Guidance Disruptor Blueprint", + "Highstroke Scoped Guidance Disruptor I": "Highstroke Scoped Guidance Disruptor", + "A-211 Enduring Guidance Disruptor I": "A-211 Enduring Guidance Disruptor", +} \ No newline at end of file