diff --git a/eos/effects/elitebonuscovertops3pctdamagepercycle.py b/eos/effects/elitebonuscovertops3pctdamagepercycle.py new file mode 100644 index 000000000..80083c966 --- /dev/null +++ b/eos/effects/elitebonuscovertops3pctdamagepercycle.py @@ -0,0 +1,6 @@ +type = "passive" + + +def handler(fit, src, context): + fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Small Precursor Weapon"), "damageMultiplierBonusPerCycle", + src.getModifiedItemAttr("eliteBonusCovertOps3"), skill="Covert Ops") diff --git a/eos/effects/elitebonusreconship3pctdamagepercycle.py b/eos/effects/elitebonusreconship3pctdamagepercycle.py new file mode 100644 index 000000000..96fab9026 --- /dev/null +++ b/eos/effects/elitebonusreconship3pctdamagepercycle.py @@ -0,0 +1,6 @@ +type = "passive" + + +def handler(fit, src, context): + fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Medium Precursor Weapon"), "damageMultiplierBonusPerCycle", + src.getModifiedItemAttr("eliteBonusReconShip3"), skill="Recon Ships") diff --git a/eos/effects/massentanglereffect5.py b/eos/effects/massentanglereffect5.py new file mode 100644 index 000000000..3c024d4d7 --- /dev/null +++ b/eos/effects/massentanglereffect5.py @@ -0,0 +1,10 @@ +type = "passive" + + +def handler(fit, src, context): + fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("warpScrambleStrength")) + fit.ship.boostItemAttr("mass", src.getModifiedItemAttr("massBonusPercentage"), stackingPenalties=True) + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner"), "speedFactor", src.getModifiedItemAttr("speedFactorBonus"), stackingPenalties=True) + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner"), "speedBoostFactor", src.getModifiedItemAttr("speedBoostFactorBonus")) + fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"), "activationBlocked", src.getModifiedItemAttr("activationBlockedStrenght")) + fit.ship.boostItemAttr("maxVelocity", src.getModifiedItemAttr("maxVelocityBonus"), stackingPenalties=True) diff --git a/eos/effects/rolebonuswarpspeed.py b/eos/effects/rolebonuswarpspeed.py new file mode 100644 index 000000000..1b295565f --- /dev/null +++ b/eos/effects/rolebonuswarpspeed.py @@ -0,0 +1,5 @@ +type = "passive" + + +def handler(fit, src, context): + fit.ship.boostItemAttr("warpSpeedMultiplier", src.getModifiedItemAttr("shipRoleBonusWarpSpeed")) diff --git a/eve.db b/eve.db index 9727bd3fb..dabaaf2d2 100644 Binary files a/eve.db and b/eve.db differ diff --git a/scripts/jsonToSql.py b/scripts/jsonToSql.py index 24492637a..b9493372a 100755 --- a/scripts/jsonToSql.py +++ b/scripts/jsonToSql.py @@ -45,6 +45,7 @@ def main(db, json_path): eos.config.debug = False # Now thats done, we can import the eos modules using the config + import eos.db import eos.gamedata # Create the database tables