Update database and implement ship effects, also make pyfa to show final damage value for disintegrators after ramp-up time is complete

(if you don't want me to commit here just write phoenix@mail.ru, i have no way to communicate with you otherwise)
This commit is contained in:
DarkPhoenix
2018-04-24 19:13:30 +03:00
parent 7c376c93a2
commit a8b1f38e84
43 changed files with 151 additions and 29 deletions

View File

@@ -2,7 +2,7 @@
#
# Used by:
# Modules from group: Missile Launcher Bomb (2 of 2)
# Modules from group: Shield Extender (33 of 33)
# Modules from group: Shield Extender (36 of 36)
type = "passive"

View File

@@ -1,7 +1,7 @@
# ammoInfluenceCapNeed
#
# Used by:
# Items from category: Charge (478 of 928)
# Items from category: Charge (493 of 943)
type = "passive"

View File

@@ -1,7 +1,7 @@
# ammoInfluenceRange
#
# Used by:
# Items from category: Charge (572 of 928)
# Items from category: Charge (587 of 943)
type = "passive"

View File

@@ -5,6 +5,7 @@
# Charges from group: Advanced Autocannon Ammo (8 of 8)
# Charges from group: Advanced Beam Laser Crystal (8 of 8)
# Charges from group: Advanced Blaster Charge (8 of 8)
# Charges from group: Advanced Charge Bottle (5 of 6)
# Charges from group: Advanced Pulse Laser Crystal (8 of 8)
# Charges from group: Advanced Railgun Charge (8 of 8)
# Charges from group: Projectile Ammo (128 of 128)

View File

@@ -1,6 +1,7 @@
# armorAllRepairSystemsAmountBonusPassive
#
# Used by:
# Implants named like: Agency 'Hardshell' TB Dose (3 of 3)
# Implants named like: Exile Booster (4 of 4)
# Implant: Antipharmakon Kosybo
type = "passive"

View File

@@ -1,7 +1,7 @@
# armorHPBonusAdd
#
# Used by:
# Modules from group: Armor Reinforcer (48 of 48)
# Modules from group: Armor Reinforcer (51 of 51)
type = "passive"

View File

@@ -1,7 +1,7 @@
# armorReinforcerMassAdd
#
# Used by:
# Modules from group: Armor Reinforcer (48 of 48)
# Modules from group: Armor Reinforcer (51 of 51)
type = "passive"

View File

@@ -1,7 +1,7 @@
# armorRepair
#
# Used by:
# Modules from group: Armor Repair Unit (105 of 105)
# Modules from group: Armor Repair Unit (108 of 108)
runTime = "late"
type = "active"

View File

@@ -4,7 +4,7 @@
# Modules from group: Capacitor Flux Coil (6 of 6)
# Modules from group: Capacitor Power Relay (20 of 20)
# Modules from group: Power Diagnostic System (23 of 23)
# Modules from group: Propulsion Module (65 of 127)
# Modules from group: Propulsion Module (68 of 133)
# Modules from group: Reactor Control Unit (22 of 22)
type = "passive"

View File

@@ -1,7 +1,7 @@
# energyNeutralizerFalloff
#
# Used by:
# Modules from group: Energy Neutralizer (51 of 51)
# Modules from group: Energy Neutralizer (54 of 54)
from eos.saveddata.module import State
from eos.modifiedAttributeDict import ModifiedAttributeDict

View File

@@ -1,7 +1,7 @@
# fueledArmorRepair
#
# Used by:
# Modules from group: Ancillary Armor Repairer (4 of 4)
# Modules from group: Ancillary Armor Repairer (7 of 7)
runTime = "late"
type = "active"

View File

@@ -1,7 +1,7 @@
# fueledShieldBoosting
#
# Used by:
# Modules from group: Ancillary Shield Booster (5 of 5)
# Modules from group: Ancillary Shield Booster (8 of 8)
runTime = "late"
type = "active"

View File

@@ -1,7 +1,7 @@
# moduleBonusAfterburner
#
# Used by:
# Modules from group: Propulsion Module (62 of 127)
# Modules from group: Propulsion Module (65 of 133)
type = "active"
runTime = "late"

View File

@@ -1,7 +1,7 @@
# moduleBonusMicrowarpdrive
#
# Used by:
# Modules from group: Propulsion Module (65 of 127)
# Modules from group: Propulsion Module (68 of 133)
type = "active"
runTime = "late"

View File

@@ -2,7 +2,7 @@
#
# Used by:
# Modules from group: Missile Launcher Torpedo (22 of 22)
# Items from market group: Ship Equipment > Turrets & Bays (429 of 863)
# Items from market group: Ship Equipment > Turrets & Bays (429 of 880)
# Module: Interdiction Sphere Launcher I
type = "overheat"

View File

@@ -1,8 +1,8 @@
# overloadSelfArmorDamageAmountDurationBonus
#
# Used by:
# Modules from group: Ancillary Armor Repairer (4 of 4)
# Modules from group: Armor Repair Unit (105 of 105)
# Modules from group: Ancillary Armor Repairer (7 of 7)
# Modules from group: Armor Repair Unit (108 of 108)
type = "overheat"

View File

@@ -3,6 +3,7 @@
# Used by:
# Modules from group: Energy Weapon (101 of 214)
# Modules from group: Hybrid Weapon (105 of 221)
# Modules from group: Precursor Turret (14 of 14)
# Modules from group: Projectile Weapon (99 of 165)
type = "overheat"

View File

@@ -2,7 +2,7 @@
#
# Used by:
# Modules from group: Capacitor Booster (59 of 59)
# Modules from group: Energy Neutralizer (51 of 51)
# Modules from group: Energy Neutralizer (54 of 54)
# Modules from group: Energy Nosferatu (51 of 51)
# Modules from group: Hull Repair Unit (25 of 25)
# Modules from group: Remote Armor Repairer (39 of 39)

View File

@@ -2,8 +2,8 @@
#
# Used by:
# Modules from group: Stasis Grappler (7 of 7)
# Modules from group: Stasis Web (18 of 18)
# Modules from group: Warp Scrambler (52 of 53)
# Modules from group: Stasis Web (19 of 19)
# Modules from group: Warp Scrambler (54 of 55)
type = "overheat"

View File

@@ -1,8 +1,8 @@
# overloadSelfShieldBonusDurationBonus
#
# Used by:
# Modules from group: Ancillary Shield Booster (5 of 5)
# Modules from group: Shield Booster (93 of 93)
# Modules from group: Ancillary Shield Booster (8 of 8)
# Modules from group: Shield Booster (97 of 97)
type = "overheat"

View File

@@ -1,7 +1,7 @@
# overloadSelfSpeedBonus
#
# Used by:
# Modules from group: Propulsion Module (127 of 127)
# Modules from group: Propulsion Module (133 of 133)
type = "overheat"

View File

@@ -2,7 +2,7 @@
#
# Used by:
# Modules from group: Stasis Grappler (7 of 7)
# Modules from group: Stasis Web (18 of 18)
# Modules from group: Stasis Web (19 of 19)
type = "active", "projected"

View File

@@ -1,7 +1,6 @@
# shieldBoostAmplifierPassive
#
# Used by:
# Implants named like: Agency 'Hardshell' TB Dose (3 of 3)
# Implants named like: grade Crystal (15 of 18)
type = "passive"

View File

@@ -1,6 +1,7 @@
# shieldBoostAmplifierPassiveBooster
#
# Used by:
# Implants named like: Agency 'Hardshell' TB Dose (3 of 3)
# Implants named like: Blue Pill Booster (5 of 5)
# Implant: Antipharmakon Thureo
type = "passive"

View File

@@ -1,7 +1,7 @@
# shieldBoosting
#
# Used by:
# Modules from group: Shield Booster (93 of 93)
# Modules from group: Shield Booster (97 of 97)
runTime = "late"
type = "active"

View File

@@ -1,7 +1,7 @@
# shieldCapacityBonusOnline
#
# Used by:
# Modules from group: Shield Extender (33 of 33)
# Modules from group: Shield Extender (36 of 36)
# Modules from group: Shield Resistance Amplifier (88 of 88)
type = "passive"

View File

@@ -0,0 +1,12 @@
# shipBonusNosNeutCapNeedRoleBonus2
#
# Used by:
# Ship: Demavik
# Ship: Leshak
# Ship: Vedmak
type = "passive"
def handler(fit, ship, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capacitor Emission Systems"),
"capacitorNeed", ship.getModifiedItemAttr("shipBonusRole2"))

View File

@@ -0,0 +1,10 @@
# shipbonusPCTDamagePC1
#
# Used by:
# Ship: Vedmak
type = "passive"
def handler(fit, ship, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Precursor Turret"),
"damageMultiplier", ship.getModifiedItemAttr("shipBonusPC1"), skill="Precursor Cruiser")

View File

@@ -0,0 +1,10 @@
# shipbonusPCTDamagePF1
#
# Used by:
# Ship: Demavik
type = "passive"
def handler(fit, ship, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Precursor Turret"),
"damageMultiplier", ship.getModifiedItemAttr("shipBonusPF1"), skill="Precursor Frigate")

View File

@@ -0,0 +1,10 @@
# shipbonusPCTOptimalPF2
#
# Used by:
# Ship: Demavik
type = "passive"
def handler(fit, ship, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Precursor Turret"),
"maxRange", ship.getModifiedItemAttr("shipBonusPF2"), skill="Precursor Frigate")

View File

@@ -0,0 +1,10 @@
# shipbonusPCTTrackingPC2
#
# Used by:
# Ship: Vedmak
type = "passive"
def handler(fit, ship, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Precursor Turret"),
"trackingSpeed", ship.getModifiedItemAttr("shipBonusPC2"), skill="Precursor Cruiser")

View File

@@ -0,0 +1,12 @@
# shipBonusRemoteRepCapNeedRoleBonus2
#
# Used by:
# Ship: Demavik
# Ship: Leshak
# Ship: Vedmak
type = "passive"
def handler(fit, ship, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
"capacitorNeed", ship.getModifiedItemAttr("shipBonusRole2"))

View File

@@ -0,0 +1,12 @@
# shipBonusRemoteRepMaxRangeRoleBonus1
#
# Used by:
# Ship: Demavik
# Ship: Leshak
# Ship: Vedmak
type = "passive"
def handler(fit, ship, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
"maxRange", ship.getModifiedItemAttr("shipBonusRole1"))

View File

@@ -0,0 +1,12 @@
# shipBonusSmartbombCapNeedRoleBonus2
#
# Used by:
# Ship: Demavik
# Ship: Leshak
# Ship: Vedmak
type = "passive"
def handler(fit, ship, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Energy Pulse Weapons"),
"capacitorNeed", ship.getModifiedItemAttr("shipBonusRole2"))

View File

@@ -0,0 +1,10 @@
# shipPCBSDmgBonusPCBS2
#
# Used by:
# Ship: Leshak
type = "passive"
def handler(fit, ship, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Precursor Turret"),
"damageMultiplier", ship.getModifiedItemAttr("shipBonusPBS2"), skill="Precursor Battleship")

View File

@@ -0,0 +1,10 @@
# shipPCBSSPeedBonusPCBS1
#
# Used by:
# Ship: Leshak
type = "passive"
def handler(fit, ship, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Precursor Turret"),
"speed", ship.getModifiedItemAttr("shipBonusPBS1"), skill="Precursor Battleship")

View File

@@ -1,7 +1,6 @@
# structuralAnalysisEffect
#
# Used by:
# Implants named like: Agency 'Hardshell' TB Dose (3 of 3)
# Implants named like: Inherent Implants 'Noble' Repair Proficiency RP (6 of 6)
# Modules named like: Auxiliary Nano Pump (8 of 8)
# Implant: Imperial Navy Modified 'Noble' Implant

View File

@@ -0,0 +1,10 @@
# targetABCAttack
#
# Used by:
# Modules from group: Precursor Turret (14 of 14)
type = 'active'
def handler(fit, module, context):
# Set reload time to 1 second
module.reloadTime = 1000

View File

@@ -1,7 +1,7 @@
# warpScramble
#
# Used by:
# Modules named like: Warp Disruptor (27 of 27)
# Modules named like: Warp Disruptor (28 of 28)
type = "projected", "active"

View File

@@ -1,7 +1,7 @@
# warpScrambleBlockMWDWithNPCEffect
#
# Used by:
# Modules named like: Warp Scrambler (26 of 26)
# Modules named like: Warp Scrambler (27 of 27)
from eos.saveddata.module import State
runTime = "early"

View File

@@ -337,6 +337,8 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
lambda attr: (func("%sDamage" % attr) or 0) * (1 - getattr(targetResists, "%sAmount" % attr, 0)),
self.DAMAGE_TYPES))
volley *= self.getModifiedItemAttr("damageMultiplier") or 1
# Disintegrator-specific ramp-up multiplier
volley *= (self.getModifiedItemAttr("damageMultiplierBonusMax") or 0) + 1
if volley:
cycleTime = self.cycleTime
# Some weapons repeat multiple times in one cycle (think doomsdays)

BIN
eve.db

Binary file not shown.

View File

@@ -101,7 +101,7 @@ class Miscellanea(ViewColumn):
return text, tooltip
pass
elif itemGroup in ("Energy Weapon", "Hybrid Weapon", "Projectile Weapon", "Combat Drone", "Fighter Drone"):
elif itemGroup in ("Energy Weapon", "Hybrid Weapon", "Projectile Weapon", "Precursor Turret", "Combat Drone", "Fighter Drone"):
trackingSpeed = stuff.getModifiedItemAttr("trackingSpeed")
if not trackingSpeed:
return "", None