Skip to content

Commit

Permalink
Disable effect overrides for AT18 ships, and add effects for them
Browse files Browse the repository at this point in the history
  • Loading branch information
@DarkFenX
DarkFenX committed Feb 22, 2023
1 parent dd1f7e2 commit 52b567a
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 167 deletions.
5 changes: 2 additions & 3 deletions db_update.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -771,9 +771,8 @@ def hardcodeBestla():
_hardcodeAttribs(74316, attrMap)
_hardcodeEffects(74316, effectMap)

hardcodeGeri()
hardcodeBestla()

# hardcodeGeri()
# hardcodeBestla()

eos.db.gamedata_session.commit()
eos.db.gamedata_engine.execute('VACUUM')
Expand Down
211 changes: 47 additions & 164 deletions eos/effects.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15629,6 +15629,7 @@ class Effect4645(BaseEffect):
eliteBonusHeavyGunshipHeavyAndHeavyAssaultAndAssaultMissileLauncherROF

Used by:
Ship: Bestla
Ship: Sacrilege
"""

Expand Down Expand Up @@ -16304,7 +16305,7 @@ class Effect4902(BaseEffect):
MWDSignatureRadiusRoleBonus

Used by:
Ships from group: Assault Frigate (9 of 14)
Ships from group: Assault Frigate (10 of 14)
Ships from group: Command Destroyer (5 of 5)
"""

Expand Down Expand Up @@ -17414,6 +17415,7 @@ class Effect5090(BaseEffect):

Used by:
Ship: Breacher
Ship: Geri
Ship: Jaguar
"""

Expand Down Expand Up @@ -33654,6 +33656,7 @@ class Effect7017(BaseEffect):
eliteBonusGunshipExplosionVelocity2

Used by:
Ship: Geri
Ship: Jaguar
"""

Expand All @@ -33662,7 +33665,7 @@ class Effect7017(BaseEffect):
@staticmethod
def handler(fit, src, context, projectionRange, **kwargs):
fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'), 'aoeVelocity',
src.getModifiedItemAttr('eliteBonusGunship2'), stackingPenalties=True, skill='Assault Frigates', **kwargs)
src.getModifiedItemAttr('eliteBonusGunship2'), skill='Assault Frigates', **kwargs)


class Effect7018(BaseEffect):
Expand Down Expand Up @@ -38919,6 +38922,7 @@ class Effect11411(BaseEffect):
shipMissileDmgMC2

Used by:
Ship: Bestla
Ship: Muninn
"""

Expand Down Expand Up @@ -38960,6 +38964,7 @@ class Effect11413(BaseEffect):
eliteBonusHeavyGunshipMissileExplosionVelocity1

Used by:
Ship: Bestla
Ship: Muninn
"""

Expand Down Expand Up @@ -39353,27 +39358,9 @@ def handler(fit, ship, context, projectionRange, **kwargs):
ship.getModifiedItemAttr('shipBonusDreadnoughtM4'), skill='Minmatar Dreadnought', **kwargs)


class Effect100100(BaseEffect):
class Effect11512(BaseEffect):
"""
pyfaCustomGeriAfExploVel

Used by:
Ship: Geri
"""

type = 'passive'

@staticmethod
def handler(fit, ship, context, projectionRange, **kwargs):
fit.modules.filteredChargeBoost(
lambda mod: mod.charge.requiresSkill('Light Missiles') or mod.charge.requiresSkill('Rockets'),
'aoeVelocity', 7.5, skill='Assault Frigates', **kwargs)



class Effect100101(BaseEffect):
"""
pyfaCustomGeriAfRof
eliteBonusGunshipLightMissileAndRocketROF

Used by:
Ship: Geri
Expand All @@ -39384,14 +39371,13 @@ class Effect100101(BaseEffect):
@staticmethod
def handler(fit, ship, context, projectionRange, **kwargs):
fit.modules.filteredItemBoost(
lambda mod: mod.item.group.name in ('Missile Launcher Rocket', 'Missile Launcher Light'),
'speed', -7.5, skill='Assault Frigates', **kwargs)

lambda mod: mod.item.group.name in ('Missile Launcher Light', 'Missile Launcher Rocket'),
'speed', ship.getModifiedItemAttr('eliteBonusGunship1'), skill='Assault Frigates', **kwargs)


class Effect100102(BaseEffect):
class Effect11513(BaseEffect):
"""
pyfaCustomGeriMfDmg
shipBonusMissileDamageMF2

Used by:
Ship: Geri
Expand All @@ -39400,83 +39386,16 @@ class Effect100102(BaseEffect):
type = 'passive'

@staticmethod
def handler(fit, src, context, projectionRange, **kwargs):
def handler(fit, ship, context, projectionRange, **kwargs):
for dmgType in ('em', 'kinetic', 'explosive', 'thermal'):
fit.modules.filteredChargeBoost(
lambda mod: mod.charge.requiresSkill('Light Missiles') or mod.charge.requiresSkill('Rockets'),
f'{dmgType}Damage', 7.5, skill='Minmatar Frigate', **kwargs)


class Effect100103(BaseEffect):
"""
pyfaCustomGeriMfRep

Used by:
Ship: Geri
"""

type = 'passive'

@staticmethod
def handler(fit, src, context, projectionRange, **kwargs):
fit.modules.filteredItemBoost(
lambda mod: mod.item.requiresSkill('Shield Operation'),
'shieldBonus', 7.5, skill='Minmatar Frigate', **kwargs)
fit.modules.filteredItemBoost(
lambda mod: mod.item.requiresSkill('Repair Systems'),
'armorDamageAmount', 7.5, skill='Minmatar Frigate', **kwargs)


class Effect100104(BaseEffect):
"""
pyfaCustomGeriRoleWebDroneStr

Used by:
Ship: Geri
"""

type = 'passive'

@staticmethod
def handler(fit, ship, context, projectionRange, **kwargs):
fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'), 'speedFactor', 500, **kwargs)


class Effect100105(BaseEffect):
"""
pyfaCustomGeriRoleWebDroneHP

Used by:
Ship: Geri
"""

type = 'passive'

@staticmethod
def handler(fit, ship, context, projectionRange, **kwargs):
for layer in ('shieldCapacity', 'armorHP', 'hp'):
fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'), layer, 250, **kwargs)


class Effect100106(BaseEffect):
"""
pyfaCustomGeriRoleWebDroneSpeed

Used by:
Ship: Geri
"""

type = 'passive'

@staticmethod
def handler(fit, ship, context, projectionRange, **kwargs):
fit.drones.filteredItemBoost(
lambda drone: drone.item.requiresSkill('Drones'), 'maxVelocity', 50, **kwargs)
lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'), f'{dmgType}Damage',
ship.getModifiedItemAttr('shipBonusMF2'), skill='Minmatar Frigate', **kwargs)


class Effect100107(BaseEffect):
class Effect11514(BaseEffect):
"""
pyfaCustomGeriRoleMWDSigBloom
shipBonusArmorRepairAmountMF

Used by:
Ship: Geri
Expand All @@ -39487,31 +39406,13 @@ class Effect100107(BaseEffect):
@staticmethod
def handler(fit, ship, context, projectionRange, **kwargs):
fit.modules.filteredItemBoost(
lambda mod: mod.item.requiresSkill('High Speed Maneuvering'),
'signatureRadiusBonus', -50, **kwargs)


class Effect100200(BaseEffect):
"""
pyfaCustomBestlaHacExploVel

Used by:
Ship: Bestla
"""

type = 'passive'

@staticmethod
def handler(fit, ship, context, projectionRange, **kwargs):
fit.modules.filteredChargeBoost(
lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles') or mod.charge.requiresSkill('Heavy Missiles'),
'aoeVelocity', 10, skill='Heavy Assault Cruisers', **kwargs)

lambda mod: mod.item.requiresSkill('Repair Systems'), 'armorDamageAmount',
ship.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate', **kwargs)


class Effect100201(BaseEffect):
class Effect11515(BaseEffect):
"""
pyfaCustomBestlaHacRof
shipBonusArmorRepairAmountMC

Used by:
Ship: Bestla
Expand All @@ -39522,36 +39423,13 @@ class Effect100201(BaseEffect):
@staticmethod
def handler(fit, ship, context, projectionRange, **kwargs):
fit.modules.filteredItemBoost(
lambda mod: mod.item.group.name in (
'Missile Launcher Heavy Assault', 'Missile Launcher Heavy', 'Missile Launcher Rapid Light'),
'speed', -10, skill='Heavy Assault Cruisers', **kwargs)



class Effect100202(BaseEffect):
"""
pyfaCustomBestlaMcDmg

Used by:
Ship: Bestla
"""

type = 'passive'

@staticmethod
def handler(fit, src, context, projectionRange, **kwargs):
for dmgType in ('em', 'kinetic', 'explosive', 'thermal'):
fit.modules.filteredChargeBoost(
lambda mod: (
mod.charge.requiresSkill('Light Missiles')
or mod.charge.requiresSkill('Heavy Assault Missiles')
or mod.charge.requiresSkill('Heavy Missiles')),
f'{dmgType}Damage', 10, skill='Minmatar Cruiser', **kwargs)
lambda mod: mod.item.requiresSkill('Repair Systems'), 'armorDamageAmount',
ship.getModifiedItemAttr('shipBonusMC'), skill='Minmatar Cruiser', **kwargs)


class Effect100203(BaseEffect):
class Effect11516(BaseEffect):
"""
pyfaCustomBestlaMcRep
shipBonusShieldBoostAmountMC

Used by:
Ship: Bestla
Expand All @@ -39560,57 +39438,62 @@ class Effect100203(BaseEffect):
type = 'passive'

@staticmethod
def handler(fit, src, context, projectionRange, **kwargs):
fit.modules.filteredItemBoost(
lambda mod: mod.item.requiresSkill('Shield Operation'),
'shieldBonus', 10, skill='Minmatar Cruiser', **kwargs)
def handler(fit, ship, context, projectionRange, **kwargs):
fit.modules.filteredItemBoost(
lambda mod: mod.item.requiresSkill('Repair Systems'),
'armorDamageAmount', 10, skill='Minmatar Cruiser', **kwargs)
lambda mod: mod.item.requiresSkill('Shield Operation'), 'shieldBonus',
ship.getModifiedItemAttr('shipBonusMC'), skill='Minmatar Cruiser', **kwargs)


class Effect100204(BaseEffect):
class Effect11517(BaseEffect):
"""
pyfaCustomBestlaRoleWebDroneStr
shipBonusStasisWebDroneHitpointsAT

Used by:
Ship: Bestla
Ship: Geri
"""

type = 'passive'

@staticmethod
def handler(fit, ship, context, projectionRange, **kwargs):
fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'), 'speedFactor', 500, **kwargs)
for layer in ('shieldCapacity', 'armorHP', 'hp'):
fit.drones.filteredItemBoost(
lambda drone: drone.item.requiresSkill('Propulsion Jamming'),
layer, ship.getModifiedItemAttr('shipBonusAT'), **kwargs)


class Effect100205(BaseEffect):
class Effect11518(BaseEffect):
"""
pyfaCustomBestlaRoleWebDroneHP
shipBonusStasisWebDroneVelocityAT2

Used by:
Ship: Bestla
Ship: Geri
"""

type = 'passive'

@staticmethod
def handler(fit, ship, context, projectionRange, **kwargs):
for layer in ('shieldCapacity', 'armorHP', 'hp'):
fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'), layer, 500, **kwargs)
fit.drones.filteredItemBoost(
lambda drone: drone.item.requiresSkill('Propulsion Jamming'),
'maxVelocity', ship.getModifiedItemAttr('shipBonusAT2'), **kwargs)


class Effect100206(BaseEffect):
class Effect11519(BaseEffect):
"""
pyfaCustomBestlaRoleWebDroneSpeed
shipBonusStasisWebDroneWebStrengthAT3

Used by:
Ship: Bestla
Ship: Geri
"""

type = 'passive'

@staticmethod
def handler(fit, ship, context, projectionRange, **kwargs):
fit.drones.filteredItemBoost(
lambda drone: drone.item.requiresSkill('Drones'), 'maxVelocity', 50, **kwargs)
lambda drone: drone.item.requiresSkill('Drones'),
'speedFactor', ship.getModifiedItemAttr('shipBonusAT3'), **kwargs)

0 comments on commit 52b567a

Please sign in to comment.