sirgje
/
RoosterReWrite
forked from chainsaw_mcginny/RoosterReWrite
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

Merge branch 'master' of https://git.j4lp.space/chainsaw_mcginny/RoosterReWrite

master
briccardo 2 years ago
parent
0d71bc5385 f984e7b0fe
commit
1cb53449a5
No known key found for this signature in database GPG Key ID: DB76C0ED564AA80A
6 changed files with 155 additions and 97 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 230
      eos/effects.py
  2. 10
      eos/gamedata.py
  3. 3
      eos/saveddata/damagePattern.py
  4. 4
      eos/saveddata/fit.py
  5. 5
      eos/saveddata/targetProfile.py
  6. BIN
      eve.db

230
eos/effects.py
View File

@ -851,6 +851,7 @@ class Effect230(BaseEffect):
Used by:
Implants named like: Eifyr and Co. 'Rogue' Afterburner AB (6 of 6)
Implant: Eifyr and Co. 'Rogue' Agility 11-11
Implant: Zor's Custom Navigation Link
Skill: Afterburner
"""
@ -885,6 +886,7 @@ class Effect242(BaseEffect):
Used by:
Implants named like: Eifyr and Co. 'Rogue' Acceleration Control AC (6 of 6)
Implant: Eifyr and Co. 'Rogue' Agility 11-11
"""
type = 'passive'
@ -1085,6 +1087,7 @@ class Effect391(BaseEffect):
Used by:
Implants named like: Inherent Implants 'Highwall' Mining MX (3 of 3)
Implant: Michi's Excavation Augmentor
Implant: ORE 'Harvester' Efficiency 11-11
Skill: Astrogeology
Skill: Mining
"""
@ -1264,10 +1267,11 @@ class Effect446(BaseEffect):
class Effect485(BaseEffect):
"""
energysystemsoperationCapRechargeBonusPostPercentRechargeRateLocationShipGroupCapacitor
capacitorRechargeTimeBonusPostPercentPassive
Used by:
Implants named like: Inherent Implants 'Squire' Capacitor Systems Operation EO (6 of 6)
Implants named like: grade Rapture (15 of 18)
Modules named like: Capacitor Control Circuit (8 of 8)
Implant: Genolution Core Augmentation CA-2
Skill: Capacitor Systems Operation
@ -1784,7 +1788,7 @@ class Effect596(BaseEffect):
ammoInfluenceRange
Used by:
Items from category: Charge (608 of 974)
Items from category: Charge (608 of 978)
"""
type = 'passive'
@ -1799,7 +1803,7 @@ class Effect598(BaseEffect):
ammoSpeedMultiplier
Used by:
Charges from group: Festival Charges (29 of 29)
Charges from group: Festival Charges (33 of 33)
Charges from group: Interdiction Probe (2 of 2)
Charges from group: Structure Festival Charges (2 of 2)
Special Edition Assetss from group: Festival Charges Expired (4 of 4)
@ -2372,7 +2376,7 @@ class Effect804(BaseEffect):
ammoInfluenceCapNeed
Used by:
Items from category: Charge (514 of 974)
Items from category: Charge (514 of 978)
"""
type = 'passive'
@ -2443,6 +2447,7 @@ class Effect856(BaseEffect):
Implants named like: Eifyr and Co. 'Rogue' Warp Drive Speed WS (6 of 6)
Implants named like: grade Ascendancy (10 of 12)
Modules named like: Hyperspatial Velocity Optimizer (8 of 8)
Implant: Eifyr and Co. 'Rogue' Agility 11-11
Implant: Serenity YC122.9 Season Booster - Warp Speed
"""
@ -3757,6 +3762,7 @@ class Effect1190(BaseEffect):
Used by:
Implants named like: Inherent Implants 'Yeti' Ice Harvesting IH (3 of 3)
Implant: ORE 'Harvester' Efficiency 11-11
Module: Medium Ice Harvester Accelerator I
Skill: Ice Harvesting
"""
@ -4266,6 +4272,7 @@ class Effect1409(BaseEffect):
Used by:
Implants named like: Poteque 'Prospector' Astrometric Acquisition AQ (3 of 3)
Implant: Poteque 'Prospector' Sharpeye 11-11
Skill: Astrometric Acquisition
Skill: Astrometrics
"""
@ -5248,7 +5255,7 @@ class Effect1730(BaseEffect):
droneDmgBonus
Used by:
Skills from group: Drones (8 of 26)
Skills from group: Drones (8 of 27)
"""
type = 'passive'
@ -7818,7 +7825,8 @@ class Effect2734(BaseEffect):
shipECMScanStrengthBonusCF
Used by:
Variations of ship: Griffin (3 of 3)
Ship: Griffin
Ship: Kitsune
"""
type = 'passive'
@ -8754,6 +8762,7 @@ class Effect2885(BaseEffect):
Used by:
Implants named like: Eifyr and Co. 'Alchemist' Gas Harvesting GH (3 of 3)
Implant: ORE 'Harvester' Efficiency 11-11
"""
type = 'passive'
@ -12506,6 +12515,7 @@ class Effect3999(BaseEffect):
Used by:
Celestials named like: Class Pulsar Effects (6 of 6)
Celestials named like: Incursion Effect (2 of 2)
Celestials named like: Volatile Ice Storm (2 of 2)
Celestial: Strong Metaliminal Plasma Firestorm
Celestial: Weak Metaliminal Plasma Firestorm
"""
@ -13450,6 +13460,7 @@ class Effect4138(BaseEffect):
Used by:
Celestials named like: Class Wolf Rayet Effects (6 of 6)
Celestials named like: Volatile Ice Storm (2 of 2)
Celestial: Strong Metaliminal Plasma Firestorm
Celestial: Weak Metaliminal Plasma Firestorm
"""
@ -13569,6 +13580,7 @@ class Effect4161(BaseEffect):
Used by:
Implants named like: Poteque 'Prospector' Astrometric Pinpointing AP (3 of 3)
Implant: Poteque 'Prospector' Sharpeye 11-11
Skill: Astrometric Pinpointing
Skill: Astrometrics
"""
@ -13592,6 +13604,7 @@ class Effect4162(BaseEffect):
Implants named like: Poteque 'Prospector' Astrometric Rangefinding AR (3 of 3)
Implants named like: grade Virtue (10 of 12)
Modules named like: Gravity Capacitor Upgrade (8 of 8)
Implant: Poteque 'Prospector' Sharpeye 11-11
Implant: Serenity YC122.9 Season Booster - Probe Scanning Strength
Skill: Astrometric Rangefinding
Skill: Astrometrics
@ -14624,28 +14637,11 @@ class Effect4396(BaseEffect):
skill='Covert Ops', **kwargs)
class Effect4397(BaseEffect):
"""
shipBonusGFTorpedoExplosionVelocity
Used by:
Ship: Nemesis
"""
type = 'passive'
@staticmethod
def handler(fit, ship, context, projectionRange, **kwargs):
fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
'aoeVelocity', ship.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate', **kwargs)
class Effect4398(BaseEffect):
"""
shipBonusMF1TorpedoExplosionVelocity
Used by:
Ship: Hound
Ship: Virtuoso
"""
@ -14657,38 +14653,6 @@ class Effect4398(BaseEffect):
'aoeVelocity', ship.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate', **kwargs)
class Effect4399(BaseEffect):
"""
shipBonusCF1TorpedoExplosionVelocity
Used by:
Ship: Manticore
"""
type = 'passive'
@staticmethod
def handler(fit, ship, context, projectionRange, **kwargs):
fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
'aoeVelocity', ship.getModifiedItemAttr('shipBonusCF'), skill='Caldari Frigate', **kwargs)
class Effect4400(BaseEffect):
"""
shipBonusAF1TorpedoExplosionVelocity
Used by:
Ship: Purifier
"""
type = 'passive'
@staticmethod
def handler(fit, ship, context, projectionRange, **kwargs):
fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
'aoeVelocity', ship.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate', **kwargs)
class Effect4413(BaseEffect):
"""
shipBonusGF1TorpedoFlightTime
@ -18154,9 +18118,9 @@ class Effect5168(BaseEffect):
@staticmethod
def handler(fit, container, context, projectionRange, **kwargs):
fit.drones.filteredItemIncrease(lambda drone: drone.item.requiresSkill('Salvage Drone Operation'),
'accessDifficultyBonus',
container.getModifiedItemAttr('accessDifficultyBonus') * container.level, **kwargs)
fit.drones.filteredItemIncrease(
lambda drone: drone.item.requiresSkill('Salvage Drone Operation'), 'accessDifficultyBonus',
container.getModifiedItemAttr('accessDifficultyBonus') * container.level, **kwargs)
class Effect5180(BaseEffect):
@ -26382,41 +26346,6 @@ class Effect6354(BaseEffect):
src.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate', **kwargs)
class Effect6355(BaseEffect):
"""
roleBonusECMCapCPU
Used by:
Ship: Griffin Navy Issue
"""
type = 'passive'
@staticmethod
def handler(fit, src, context, projectionRange, **kwargs):
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM', 'capacitorNeed',
src.getModifiedItemAttr('roleBonus'), **kwargs)
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM', 'cpu', src.getModifiedItemAttr('roleBonus'), **kwargs)
class Effect6356(BaseEffect):
"""
roleBonusECMRange
Used by:
Ship: Griffin Navy Issue
"""
type = 'passive'
@staticmethod
def handler(fit, src, context, projectionRange, **kwargs):
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM', 'falloffEffectiveness',
src.getModifiedItemAttr('roleBonus'), **kwargs)
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM', 'maxRange',
src.getModifiedItemAttr('roleBonus'), **kwargs)
class Effect6357(BaseEffect):
"""
shipBonusJustScramblerRangeGF2
@ -36934,6 +36863,7 @@ class Effect8076(BaseEffect):
systemHullThermalResistance
Used by:
Celestials named like: Volatile Ice Storm (2 of 2)
Celestial: Strong Metaliminal Plasma Firestorm
Celestial: Weak Metaliminal Plasma Firestorm
"""
@ -37236,3 +37166,117 @@ class Effect8098(BaseEffect):
def handler(fit, ship, context, projectionRange, **kwargs):
fit.ship.boostItemAttr('armorHP', ship.getModifiedItemAttr('shipBonusAD2'),
skill='Amarr Destroyer', **kwargs)
class Effect8100(BaseEffect):
"""
shipBonusECMJamDroneDurationCF
Used by:
Ship: Griffin Navy Issue
"""
type = 'passive'
@staticmethod
def handler(fit, ship, context, projectionRange, **kwargs):
fit.drones.filteredItemBoost(
lambda drone: drone.item.requiresSkill('Drones'),
'ecmJamDuration', ship.getModifiedItemAttr('shipBonusCF'),
skill='Caldari Frigate', **kwargs)
class Effect8101(BaseEffect):
"""
roleBonusDroneDamage
Used by:
Ship: Griffin Navy Issue
"""
type = 'passive'
@staticmethod
def handler(fit, ship, context, projectionRange, **kwargs):
for dmgType in ('em', 'kinetic', 'explosive', 'thermal'):
fit.drones.filteredItemBoost(
lambda drone: drone.item.requiresSkill('Drones'),
f'{dmgType}Damage', ship.getModifiedItemAttr('roleBonus'), **kwargs)
class Effect8102(BaseEffect):
"""
shipBonusRole1DroneHitpointsDroneControlRange
Used by:
Ship: Griffin Navy Issue
"""
type = 'passive'
@staticmethod
def handler(fit, ship, context, projectionRange, **kwargs):
fit.extraAttributes.boost(
'droneControlRange', ship.getModifiedItemAttr('shipBonusRole1'), **kwargs)
for attr in ('shieldCapacity', 'armorHP', 'hp'):
fit.drones.filteredItemBoost(
lambda drone: drone.item.requiresSkill('Drones'),
attr, ship.getModifiedItemAttr('shipBonusRole1'), **kwargs)
class Effect8099(BaseEffect):
"""
systemHeatDamageBonus
Used by:
Celestials named like: Metaliminal Yoiul Festival YC 122 Storm (4 of 4)
Celestials named like: Volatile Ice Storm (2 of 2)
"""
runTime = 'early'
type = ('projected', 'passive')
@staticmethod
def handler(fit, source, context, projectionRange, **kwargs):
fit.modules.filteredItemBoost(
lambda mod: 'heatDamage' in mod.itemModifiedAttributes,
'heatDamage', source.getModifiedItemAttr('thermodynamicsHeatDamage'), **kwargs)
class Effect8103(BaseEffect):
"""
setBonusRapture
Used by:
Implants named like: grade Rapture (18 of 18)
"""
runTime = 'early'
type = 'passive'
@staticmethod
def handler(fit, src, context, projectionRange, **kwargs):
fit.appliedImplants.filteredItemMultiply(
lambda mod: mod.item.requiresSkill('Cybernetics'),
'capRechargeBonus', src.getModifiedItemAttr('ImplantSetRapture'), **kwargs)
class Effect8104(BaseEffect):
"""
salvageDroneSpecBonus
Used by:
Skill: Salvage Drone Specialization
"""
type = 'passive'
@staticmethod
def handler(fit, src, context, projectionRange, **kwargs):
lvl = src.level
fit.drones.filteredItemBoost(
lambda mod: mod.item.requiresSkill('Salvage Drone Specialization'),
'accessDifficultyBonus', src.getModifiedItemAttr('accessDifficultyBonus') * lvl, **kwargs)
fit.drones.filteredItemBoost(
lambda mod: mod.item.requiresSkill('Salvage Drone Specialization'),
'maxVelocity', src.getModifiedItemAttr('maxVelocityBonus') * lvl, **kwargs)

10
eos/gamedata.py
View File

@ -19,7 +19,7 @@
import json
from collections import OrderedDict
import re
from logbook import Logger
from sqlalchemy.orm import reconstructor
@ -33,6 +33,10 @@ from .eqBase import EqBase
pyfalog = Logger(__name__)
def _t(x):
return x
class Effect(EqBase):
"""
The effect handling class, it is used to proxy and load effect handler code,
@ -245,6 +249,10 @@ class Item(EqBase):
pass
return shortName
@property
def customName(self):
return re.sub(_t('Caustic'), _t('Tachyon'), self.name)
@property
def attributes(self):
return self.__attributes

3
eos/saveddata/damagePattern.py
View File

@ -146,6 +146,9 @@ BUILTINS = OrderedDict([
(-94, (_c(_t('NPC')) + _c(_t('Invasion')) + _c(_t('Gallente EDENCOM Entities')) + _t('Dread/Subcaps'), 0, 417, 583, 0)),
(-95, (_c(_t('NPC')) + _c(_t('Invasion')) + _c(_t('Minmatar EDENCOM Entities')) + _t('Dread'), 0, 0, 583, 417)),
(-96, (_c(_t('NPC')) + _c(_t('Invasion')) + _c(_t('Minmatar EDENCOM Entities')) + _t('Subcaps'), 302, 136, 328, 234)),
(-110, (_c(_t('NPC')) + _c(_t('Invasion')) + _t('Drifter Entities'), 250, 250, 250, 250)),
(-112, (_c(_t('NPC')) + _c(_t('Invasion')) + _t('Sleeper Entities'), 265, 265, 235, 235)),
(-111, (_c(_t('NPC')) + _c(_t('Invasion')) + _t('Rogue Drone Entities'), 250, 250, 250, 250)),
(-97, (_c(_t('NPC')) + _c(_t('Mission')) + _t('Amarr Empire'), 4464, 3546, 97, 0)),
(-98, (_c(_t('NPC')) + _c(_t('Mission')) + _t('Caldari State'), 0, 2139, 4867, 0)),
(-99, (_c(_t('NPC')) + _c(_t('Mission')) + _t('CONCORD'), 336, 134, 212, 412)),

4
eos/saveddata/fit.py
View File

@ -682,8 +682,8 @@ class Fit:
"duration", value, stackingPenalties=True)
if warfareBuffID == 25: # Mining Burst: Mining Equipment Preservation: Crystal Volatility
self.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining"),
"crystalVolatilityChance", value, stackingPenalties=True)
self.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Mining"),
"crystalVolatilityChance", value, stackingPenalties=True)
if warfareBuffID == 26: # Information Burst: Sensor Optimization: Targeting Range
self.ship.boostItemAttr("maxTargetRange", value, stackingPenalties=True)

5
eos/saveddata/targetProfile.py
View File

@ -226,7 +226,10 @@ BUILTINS = OrderedDict([
(-183, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T3 (Some T5 Rooms)')) + _t('Angel'), 0.59, 0.528, 0.477, 0.197)),
(-184, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T4/T5/T6')) + _t('Concord'), 0.324, 0.318, 0.369, 0.086)),
(-185, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T4/T5/T6')) + _t('Sansha'), 0.137, 0.355, 0.352, 0)),
(-186, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T4/T5/T6')) + _t('Angel'), 0.59, 0.528, 0.477, 0.126))])
(-186, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T4/T5/T6')) + _t('Angel'), 0.59, 0.528, 0.477, 0.126)),
(-187, (_c(_t('NPC')) + _c(_t('Invasion')) + _t('Drifter Entities'), 0.128, 0.375, 0.383, 0.383)),
(-188, (_c(_t('NPC')) + _c(_t('Invasion')) + _t('Rogue Drone Entities'), 0.104, 0.147, 0.147, 0.102)),
(-189, (_c(_t('NPC')) + _c(_t('Invasion')) + _t('Sleeper Entities'), 0.563, 0.563, 0.563, 0.563))])
class TargetProfile:

BIN
eve.db
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save