Release/v1.33.0 (#1319)

* update database file to SISI 1202899

* Effect and group renaming

* Add civilian modules (#1308)

* Add new effects

* update effect headers

* update database to tq - lifeblood (1203953)

* Update renders

* Update icons

* bump version

* fix tox errors

* change up tox config to ignore E722

* more tox ignores

* Try disabling tests for now. Rifter stats changed, causing breakage. This is why we need properly mocked data, not crap straight from the database.

* Try this

* more testing

* Fuck it, disable branch protection until I can evaluate the test failures and what needs to be done to get them back on the path
This commit is contained in:
Ryan Holmes
2017-10-25 23:33:05 -04:00
committed by GitHub
parent 34c692c972
commit fd6e318ae3
85 changed files with 472 additions and 44 deletions

View File

@@ -20,9 +20,9 @@ saveInRoot = False
# Version data
version = "1.33.0"
tag = "git"
expansionName = "YC119.9"
expansionVersion = "1.3"
tag = "Stable"
expansionName = "Lifeblood"
expansionVersion = "1.0"
evemonMinVersion = "4081"
pyfaPath = None

View File

@@ -1,9 +1,7 @@
# ammoInfluenceCapNeed
#
# Used by:
# Items from category: Charge (464 of 910)
# Charges from group: Frequency Crystal (184 of 184)
# Charges from group: Hybrid Charge (208 of 208)
# Items from category: Charge (478 of 924)
type = "passive"

View File

@@ -1,7 +1,7 @@
# ammoInfluenceRange
#
# Used by:
# Items from category: Charge (568 of 910)
# Items from category: Charge (572 of 924)
type = "passive"

View File

@@ -1,7 +1,7 @@
# boosterArmorHpPenalty
#
# Used by:
# Implants from group: Booster (12 of 49)
# Implants from group: Booster (12 of 52)
type = "boosterSideEffect"
# User-friendly name for the side effect

View File

@@ -1,7 +1,7 @@
# boosterMaxVelocityPenalty
#
# Used by:
# Implants from group: Booster (12 of 49)
# Implants from group: Booster (12 of 52)
type = "boosterSideEffect"
# User-friendly name for the side effect

View File

@@ -1,7 +1,7 @@
# boosterShieldCapacityPenalty
#
# Used by:
# Implants from group: Booster (12 of 49)
# Implants from group: Booster (12 of 52)
type = "boosterSideEffect"
# User-friendly name for the side effect

View File

@@ -4,9 +4,9 @@
# Ships from group: Carrier (4 of 4)
# Ships from group: Combat Battlecruiser (13 of 13)
# Ships from group: Command Ship (8 of 8)
# Ships from group: Force Auxiliary (5 of 5)
# Ships from group: Force Auxiliary (6 of 6)
# Ships from group: Supercarrier (6 of 6)
# Ships from group: Titan (6 of 6)
# Ships from group: Titan (7 of 7)
# Subsystems named like: Offensive Support Processor (4 of 4)
# Ship: Orca
# Ship: Rorqual

View File

@@ -2,6 +2,7 @@
#
# Used by:
# Ship: Enforcer
# Ship: Marshal
# Ship: Pacifier
type = "passive"

View File

@@ -1,7 +1,7 @@
# covertOpsAndReconOpsCloakModuleDelayBonus
#
# Used by:
# Ships from group: Black Ops (4 of 4)
# Ships from group: Black Ops (5 of 5)
# Ships from group: Blockade Runner (4 of 4)
# Ships from group: Covert Ops (7 of 7)
# Ships from group: Expedition Frigate (2 of 2)

View File

@@ -1,7 +1,7 @@
# covertOpsStealthBomberTargettingDelayBonus
#
# Used by:
# Ships from group: Black Ops (4 of 4)
# Ships from group: Black Ops (5 of 5)
# Ships from group: Stealth Bomber (4 of 5)
# Ship: Caedes
# Ship: Chremoas

View File

@@ -1,7 +1,7 @@
# doHacking
#
# Used by:
# Modules from group: Data Miners (15 of 16)
# Modules from group: Data Miners (17 of 18)
type = "active"

View File

@@ -1,7 +1,7 @@
# eliteBonusBlackOpsCloakVelocity2
#
# Used by:
# Ships from group: Black Ops (4 of 4)
# Ships from group: Black Ops (5 of 5)
type = "passive"

View File

@@ -0,0 +1,10 @@
# eliteBonusBlackOpsScramblerRange4
#
# Used by:
# Ship: Marshal
type = "passive"
def handler(fit, src, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Warp Scrambler", "maxRange",
src.getModifiedItemAttr("eliteBonusBlackOps4"), stackingPenalties=True, skill="Black Ops")

View File

@@ -0,0 +1,9 @@
# eliteBonusBlackOpsWarpVelocity1
#
# Used by:
# Ship: Marshal
type = "passive"
def handler(fit, src, context):
fit.ship.boostItemAttr("warpSpeedMultiplier", src.getModifiedItemAttr("eliteBonusBlackOps1"), stackingPenalties=True, skill="Black Ops")

View File

@@ -0,0 +1,10 @@
# eliteBonusBlackOpsWebRange3
#
# Used by:
# Ship: Marshal
type = "passive"
def handler(fit, src, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web", "maxRange",
src.getModifiedItemAttr("eliteBonusBlackOps3"), stackingPenalties=True, skill="Black Ops")

View File

@@ -1,7 +1,7 @@
# entosisDurationMultiply
#
# Used by:
# Items from market group: Ships > Capital Ships (28 of 37)
# Items from market group: Ships > Capital Ships (31 of 40)
type = "passive"

View File

@@ -1,8 +1,8 @@
# miningInfoMultiplier
#
# Used by:
# Charges from group: Mining Crystal (30 of 30)
# Charges named like: Mining Crystal (32 of 32)
# Charges from group: Mining Crystal (40 of 40)
# Charges named like: Mining Crystal (42 of 42)
type = "passive"

View File

@@ -1,7 +1,7 @@
# missileSkillFoFAoeCloudSizeBonus
#
# Used by:
# Implants named like: Zainou 'Snapshot' FOF Explosion Radius FR (6 of 6)
# Implants named like: Zainou 'Snapshot' Auto Targeting Explosion Radius FR (6 of 6)
type = "passive"

View File

@@ -1,6 +1,7 @@
# missileSkillWarheadUpgradesEmDamageBonus
#
# Used by:
# Implants named like: Agency Damage Booster (3 of 3)
# Skill: Warhead Upgrades
type = "passive"

View File

@@ -1,6 +1,7 @@
# missileSkillWarheadUpgradesExplosiveDamageBonus
#
# Used by:
# Implants named like: Agency Damage Booster (3 of 3)
# Skill: Warhead Upgrades
type = "passive"

View File

@@ -1,6 +1,7 @@
# missileSkillWarheadUpgradesKineticDamageBonus
#
# Used by:
# Implants named like: Agency Damage Booster (3 of 3)
# Skill: Warhead Upgrades
type = "passive"

View File

@@ -1,6 +1,7 @@
# missileSkillWarheadUpgradesThermalDamageBonus
#
# Used by:
# Implants named like: Agency Damage Booster (3 of 3)
# Skill: Warhead Upgrades
type = "passive"

View File

@@ -1,7 +1,7 @@
# overloadSelfDamageBonus
#
# Used by:
# Modules from group: Energy Weapon (101 of 209)
# Modules from group: Energy Weapon (101 of 213)
# Modules from group: Hybrid Weapon (105 of 221)
# Modules from group: Projectile Weapon (99 of 165)
type = "overheat"

View File

@@ -1,7 +1,7 @@
# salvaging
#
# Used by:
# Modules from group: Salvager (2 of 2)
# Modules from group: Salvager (3 of 3)
type = "active"

View File

@@ -1,7 +1,7 @@
# shipAdvancedSpaceshipCommandAgilityBonus
#
# Used by:
# Items from market group: Ships > Capital Ships (37 of 37)
# Items from market group: Ships > Capital Ships (40 of 40)
type = "passive"

View File

@@ -1,6 +1,7 @@
# shipBonusDreadnoughtC2ShieldResists
#
# Used by:
# Ship: Caiman
# Ship: Phoenix
type = "passive"

View File

@@ -0,0 +1,20 @@
# shipBonusDreadnoughtG1KinThermDamageBonus
#
# Used by:
# Ship: Caiman
type = "passive"
def handler(fit, src, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Torpedoes"), "kineticDamage",
src.getModifiedItemAttr("shipBonusDreadnoughtG1"), skill="Gallente Dreadnought")
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Torpedoes"), "thermalDamage",
src.getModifiedItemAttr("shipBonusDreadnoughtG1"), skill="Gallente Dreadnought")
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("XL Torpedoes"), "kineticDamage",
src.getModifiedItemAttr("shipBonusDreadnoughtG1"), skill="Gallente Dreadnought")
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("XL Torpedoes"), "thermalDamage",
src.getModifiedItemAttr("shipBonusDreadnoughtG1"), skill="Gallente Dreadnought")
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("XL Cruise Missiles"), "thermalDamage",
src.getModifiedItemAttr("shipBonusDreadnoughtG1"), skill="Gallente Dreadnought")
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("XL Cruise Missiles"), "kineticDamage",
src.getModifiedItemAttr("shipBonusDreadnoughtG1"), skill="Gallente Dreadnought")

View File

@@ -1,6 +1,7 @@
# shipBonusForceAuxiliaryC1RemoteBoostAndCapAmount
#
# Used by:
# Ship: Loggerhead
# Ship: Minokawa
type = "passive"

View File

@@ -1,6 +1,7 @@
# shipBonusForceAuxiliaryC2ShieldResists
#
# Used by:
# Ship: Loggerhead
# Ship: Minokawa
type = "passive"

View File

@@ -0,0 +1,10 @@
# shipBonusForceAuxiliaryG1RemoteShieldBoostAmount
#
# Used by:
# Ship: Loggerhead
type = "passive"
def handler(fit, src, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems"), "shieldBonus",
src.getModifiedItemAttr("shipBonusForceAuxiliaryG1"), skill="Gallente Carrier")

View File

@@ -1,6 +1,7 @@
# shipBonusLargeEnergyTurretMaxRangeAB
#
# Used by:
# Ship: Marshal
# Ship: Paladin
type = "passive"

View File

@@ -2,6 +2,7 @@
#
# Used by:
# Ship: Abaddon
# Ship: Marshal
type = "passive"

View File

@@ -0,0 +1,12 @@
# shipBonusLargeMissileFlightTimeCB1
#
# Used by:
# Ship: Marshal
type = "passive"
def handler(fit, src, context):
fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "explosionDelay",
src.getModifiedItemAttr("shipBonusCB"), skill="Caldari Battleship")
fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"), "explosionDelay",
src.getModifiedItemAttr("shipBonusCB"), skill="Caldari Battleship")

View File

@@ -0,0 +1,14 @@
# shipBonusLauncherRoF2CB
#
# Used by:
# Ship: Marshal
type = "passive"
def handler(fit, src, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Cruise", "speed",
src.getModifiedItemAttr("shipBonus2CB"), skill="Caldari Battleship")
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Torpedo", "speed",
src.getModifiedItemAttr("shipBonus2CB"), skill="Caldari Battleship")
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Rapid Heavy", "speed",
src.getModifiedItemAttr("shipBonus2CB"), skill="Caldari Battleship")

View File

@@ -1,6 +1,7 @@
# shipBonusPTFalloffMB1
#
# Used by:
# Ship: Marshal
# Ship: Vargur
type = "passive"

View File

@@ -1,7 +1,7 @@
# shipBonusRole1CommandBurstCPUBonus
#
# Used by:
# Ships from group: Force Auxiliary (5 of 5)
# Ships from group: Force Auxiliary (6 of 6)
type = "passive"

View File

@@ -1,7 +1,7 @@
# shipBonusRole1NumWarfareLinks
#
# Used by:
# Ships from group: Titan (6 of 6)
# Ships from group: Titan (7 of 7)
type = "passive"

View File

@@ -1,7 +1,7 @@
# shipBonusRole2ArmorPlates&ShieldExtendersBonus
#
# Used by:
# Ships from group: Titan (6 of 6)
# Ships from group: Titan (7 of 7)
type = "passive"

View File

@@ -0,0 +1,20 @@
# shipBonusRole2LogisticDroneRepAmountAndHitpointBonus
#
# Used by:
# Ship: Loggerhead
type = "passive"
def handler(fit, src, context):
fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Repair Drone Operation"),
"structureDamageAmount", src.getModifiedItemAttr("shipBonusRole2"))
fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Repair Drone Operation"),
"shieldBonus", src.getModifiedItemAttr("shipBonusRole2"))
fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Repair Drone Operation"),
"armorDamageAmount", src.getModifiedItemAttr("shipBonusRole2"))
fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Repair Drone Operation"),
"armorHP", src.getModifiedItemAttr("shipBonusRole2"))
fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Repair Drone Operation"),
"shieldCapacity", src.getModifiedItemAttr("shipBonusRole2"))
fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Repair Drone Operation"),
"hp", src.getModifiedItemAttr("shipBonusRole2"))

View File

@@ -1,7 +1,7 @@
# shipBonusRole2LogisticDroneBonus
# shipBonusRole2LogisticDroneRepAmountBonus
#
# Used by:
# Ships from group: Force Auxiliary (5 of 5)
# Ships from group: Force Auxiliary (5 of 6)
type = "passive"

View File

@@ -1,7 +1,7 @@
# shipBonusRole3NumWarfareLinks
#
# Used by:
# Ships from group: Force Auxiliary (5 of 5)
# Ships from group: Force Auxiliary (6 of 6)
type = "passive"

View File

@@ -1,6 +1,7 @@
# shipBonusTitanRole3TorpdeoVelocityBonus
# shipBonusRole3XLTorpdeoVelocityBonus
#
# Used by:
# Ship: Komodo
# Ship: Leviathan
type = "passive"

View File

@@ -0,0 +1,17 @@
# shipBonusRole4FighterDamageAndHitpoints
#
# Used by:
# Ship: Caiman
# Ship: Komodo
type = "passive"
def handler(fit, src, context):
fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "shieldCapacity",
src.getModifiedItemAttr("shipBonusRole4"))
fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackTurretDamageMultiplier",
src.getModifiedItemAttr("shipBonusRole4"))
fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackMissileDamageMultiplier",
src.getModifiedItemAttr("shipBonusRole4"))
fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityMissilesDamageMultiplier",
src.getModifiedItemAttr("shipBonusRole4"))

View File

@@ -0,0 +1,12 @@
# shipBonusTitanC1ShieldResists
#
# Used by:
# Ship: Komodo
type = "passive"
def handler(fit, src, context):
fit.ship.boostItemAttr("shieldKineticDamageResonance", src.getModifiedItemAttr("shipBonusTitanC1"), skill="Caldari Titan")
fit.ship.boostItemAttr("shieldEmDamageResonance", src.getModifiedItemAttr("shipBonusTitanC1"), skill="Caldari Titan")
fit.ship.boostItemAttr("shieldExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusTitanC1"), skill="Caldari Titan")
fit.ship.boostItemAttr("shieldThermalDamageResonance", src.getModifiedItemAttr("shipBonusTitanC1"), skill="Caldari Titan")

View File

@@ -1,6 +1,7 @@
# shipBonusTitanC2ROFBonus
#
# Used by:
# Ship: Komodo
# Ship: Leviathan
type = "passive"

View File

@@ -1,6 +1,7 @@
# shipBonusTitanC3WarpStrength
#
# Used by:
# Ship: Komodo
# Ship: Leviathan
type = "passive"

View File

@@ -0,0 +1,20 @@
# shipBonusTitanG1KinThermDamageBonus
#
# Used by:
# Ship: Komodo
type = "passive"
def handler(fit, src, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Torpedoes"), "thermalDamage",
src.getModifiedItemAttr("shipBonusTitanG1"), skill="Gallente Titan")
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Torpedoes"), "kineticDamage",
src.getModifiedItemAttr("shipBonusTitanG1"), skill="Gallente Titan")
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("XL Torpedoes"), "thermalDamage",
src.getModifiedItemAttr("shipBonusTitanG1"), skill="Gallente Titan")
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("XL Torpedoes"), "kineticDamage",
src.getModifiedItemAttr("shipBonusTitanG1"), skill="Gallente Titan")
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("XL Cruise Missiles"), "thermalDamage",
src.getModifiedItemAttr("shipBonusTitanG1"), skill="Gallente Titan")
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("XL Cruise Missiles"), "kineticDamage",
src.getModifiedItemAttr("shipBonusTitanG1"), skill="Gallente Titan")

View File

@@ -0,0 +1,26 @@
# shipBonusTitanG2AllDamageBonus
#
# Used by:
# Ship: Komodo
type = "passive"
def handler(fit, src, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Torpedoes"), "thermalDamage",
src.getModifiedItemAttr("shipBonusTitanG2"), skill="Gallente Titan")
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Torpedoes"), "explosiveDamage",
src.getModifiedItemAttr("shipBonusTitanG2"), skill="Gallente Titan")
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Torpedoes"), "emDamage",
src.getModifiedItemAttr("shipBonusTitanG2"), skill="Gallente Titan")
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("XL Torpedoes"), "thermalDamage",
src.getModifiedItemAttr("shipBonusTitanG2"), skill="Gallente Titan")
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("XL Torpedoes"), "emDamage",
src.getModifiedItemAttr("shipBonusTitanG2"), skill="Gallente Titan")
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("XL Torpedoes"), "explosiveDamage",
src.getModifiedItemAttr("shipBonusTitanG2"), skill="Gallente Titan")
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("XL Cruise Missiles"), "emDamage",
src.getModifiedItemAttr("shipBonusTitanG2"), skill="Gallente Titan")
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("XL Cruise Missiles"), "thermalDamage",
src.getModifiedItemAttr("shipBonusTitanG2"), skill="Gallente Titan")
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("XL Cruise Missiles"), "explosiveDamage",
src.getModifiedItemAttr("shipBonusTitanG2"), skill="Gallente Titan")

View File

@@ -2,6 +2,7 @@
#
# Used by:
# Variations of ship: Erebus (2 of 2)
# Ship: Komodo
type = "passive"

View File

@@ -1,7 +1,7 @@
# shipBonusTitanM3WarpStrength
#
# Used by:
# Ships from group: Titan (3 of 6)
# Ships from group: Titan (3 of 7)
type = "passive"

View File

@@ -1,7 +1,7 @@
# shipCapitalAgilityBonus
#
# Used by:
# Items from market group: Ships > Capital Ships (28 of 37)
# Items from market group: Ships > Capital Ships (31 of 40)
type = "passive"

View File

@@ -4,6 +4,7 @@
# Ship: Dominix Navy Issue
# Ship: Hyperion
# Ship: Kronos
# Ship: Marshal
# Ship: Megathron Federate Issue
# Ship: Sin
type = "passive"

View File

@@ -2,6 +2,7 @@
#
# Used by:
# Ships named like: Megathron (3 of 3)
# Ship: Marshal
type = "passive"

View File

@@ -3,6 +3,7 @@
# Used by:
# Variations of ship: Tempest (4 of 4)
# Ship: Maelstrom
# Ship: Marshal
# Ship: Panther
# Ship: Typhoon Fleet Issue
type = "passive"

View File

@@ -1,6 +1,7 @@
# surgicalStrikeDamageMultiplierBonusPostPercentDamageMultiplierLocationShipModulesRequiringGunnery
#
# Used by:
# Implants named like: Agency Damage Booster (3 of 3)
# Implants named like: Eifyr and Co. 'Gunslinger' Surgical Strike SS (6 of 6)
# Implant: Standard Cerebral Accelerator
type = "passive"

View File

@@ -2,7 +2,7 @@
#
# Used by:
# Drones from group: Combat Drone (74 of 74)
# Modules from group: Energy Weapon (208 of 209)
# Modules from group: Energy Weapon (212 of 213)
type = 'active'

BIN
eve.db

Binary file not shown.

View File

@@ -548,17 +548,17 @@ class Miscellanea(ViewColumn):
"Advanced Rocket",
"Light Missile",
"Advanced Light Missile",
"FoF Light Missile",
"Auto-Targeting Light Missile",
"Heavy Assault Missile",
"Advanced Heavy Assault Missile",
"Heavy Missile",
"Advanced Heavy Missile",
"FoF Heavy Missile",
"Auto-Targeting Heavy Missile",
"Torpedo",
"Advanced Torpedo",
"Cruise Missile",
"Advanced Cruise Missile",
"FoF Cruise Missile",
"Auto-Targeting Cruise Missile",
"XL Torpedo",
"XL Cruise Missile"
):

BIN
imgs/icons/118_15.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 790 B

BIN
imgs/icons/128_1.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 818 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 678 B

After

Width:  |  Height:  |  Size: 672 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 648 B

After

Width:  |  Height:  |  Size: 647 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 731 B

After

Width:  |  Height:  |  Size: 732 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 771 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 782 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 646 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 757 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 779 B

BIN
imgs/renders/27299.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
imgs/renders/27301.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
imgs/renders/27303.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
imgs/renders/27305.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
imgs/renders/35835.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
imgs/renders/35836.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
imgs/renders/44996.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
imgs/renders/45530.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
imgs/renders/45531.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
imgs/renders/45645.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
imgs/renders/45647.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
imgs/renders/45649.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

View File

@@ -6332,7 +6332,7 @@
description: icon for the station service slot
iconFile: res:/UI/Texture/classes/Fitting/stationServiceSlot.png
21513:
description: Focused Warp Disruption Script
description: Focused Warp Scrambling Script
iconFile: res:/ui/texture/icons/118_64_12.png
21514:
description: Upwell Male Jacket
@@ -6889,3 +6889,234 @@
21742:
description: Icon for the Xmas crates
iconFile: res:/UI/Texture/Icons/Inventory/holidayCrate.png
21743:
description: Focused Warp Disruption Script
iconFile: res:/ui/texture/icons/118_64_15.png
21744:
description: SOE Exploration Suit Female
iconFile: res:/UI/Asset/mannequin/outer/45514_female_Outer_ExplorationSuit_F01_Types_ExplorationSuit_F01_SOE.png
21745:
description: Caldari Exploration Suit Female
iconFile: res:/UI/Asset/mannequin/outer/45515_female_Outer_ExplorationSuit_F01_Types_ExplorationSuit_F01_Caldari.png
21746:
description: Minmatar Exploration Suit Female
iconFile: res:/UI/Asset/mannequin/outer/45516_female_Outer_ExplorationSuit_F01_Types_ExplorationSuit_F01_Minmatar.png
21747:
description: Gallente Exploration Suit Female
iconFile: res:/UI/Asset/mannequin/outer/45517_female_Outer_ExplorationSuit_F01_Types_ExplorationSuit_F01_Gallente.png
21748:
description: Amarr Exploration Suit Female
iconFile: res:/UI/Asset/mannequin/outer/45518_female_Outer_ExplorationSuit_F01_Types_ExplorationSuit_F01_Amarr.png
21749:
description: Caldari Orange Exploration Suit Female
iconFile: res:/UI/Asset/mannequin/outer/45519_female_Outer_ExplorationSuit_F01_Types_ExplorationSuit_F01_CaldariOrange.png
21750:
description: ORE Exploration Suit Female
iconFile: res:/UI/Asset/mannequin/outer/45520_female_Outer_ExplorationSuit_F01_Types_ExplorationSuit_F01_ORE.png
21751:
description: Gallente Exploration Suit Male
iconFile: res:/UI/Asset/mannequin/outer/45521_male_outer_ExplorationSuit_M01_Types_ExplorationSuit_M01_Gallente.png
21752:
description: ORE Exploration Suit Male
iconFile: res:/UI/Asset/mannequin/outer/45522_male_outer_ExplorationSuit_M01_Types_ExplorationSuit_M01_ORE.png
21753:
description: SOE Exploration Suit Male
iconFile: res:/UI/Asset/mannequin/outer/45523_male_outer_ExplorationSuit_M01_Types_ExplorationSuit_M01_SOE.png
21754:
description: Caldari Exploration Suit Male
iconFile: res:/UI/Asset/mannequin/outer/45524_male_outer_ExplorationSuit_M01_Types_ExplorationSuit_M01_Caldari.png
21755:
description: Minmatar Exploration Suit Male
iconFile: res:/UI/Asset/mannequin/outer/45525_male_outer_ExplorationSuit_M01_Types_ExplorationSuit_M01_Minmatar.png
21756:
description: Amarr Exploration Suit Male
iconFile: res:/UI/Asset/mannequin/outer/45526_male_outer_ExplorationSuit_M01_Types_ExplorationSuit_M01_Amarr.png
21757:
description: Caldari Orange Exploration Suit Male
iconFile: res:/UI/Asset/mannequin/outer/45527_male_outer_ExplorationSuit_M01_Types_ExplorationSuit_M01_CaldariOrange.png
21760:
description: Project Discovery Crate Icon
iconFile: res:/UI/Texture/classes/ItemPacks/SplashImages/ProjectDiscoveryPlaceholder.png
21763:
description: 45734_female_TopMiddle_TshirtF01_Types_TshirtF01_Exo.png
iconFile: res:/UI/Asset/mannequin/topmiddle/45734_female_TopMiddle_TshirtF01_Types_TshirtF01_Exo.png
21764:
description: 45735_female_Outer_ExplorationSuit_F01_Types_ExplorationSuit_F01_Exo.png
iconFile: res:/UI/Asset/mannequin/outer/45735_female_Outer_ExplorationSuit_F01_Types_ExplorationSuit_F01_Exo.png
21765:
description: 45737_female_Outer_LabCoatF01_Types_LabCoatF01_Exo.png
iconFile: res:/UI/Asset/mannequin/outer/45737_female_Outer_LabCoatF01_Types_LabCoatF01_Exo.png
21766:
description: 45738_female_Outer_JacketMilF01_Types_JacketMilF01_exo.png
iconFile: res:/UI/Asset/mannequin/outer/45738_female_Outer_JacketMilF01_Types_JacketMilF01_exo.png
21767:
description: 45739_female_hair_HeadWear_Cap_F01_Types_HeadWear_Cap_F01_Exo.png
iconFile: res:/UI/Asset/mannequin/hair/45739_female_hair_HeadWear_Cap_F01_Types_HeadWear_Cap_F01_Exo.png
21768:
description: 45740_male_hair_HeadWear_Cap_M01_Types_HeadWear_Cap_M01_Exo.png
iconFile: res:/UI/Asset/mannequin/hair/45740_male_hair_HeadWear_Cap_M01_Types_HeadWear_Cap_M01_Exo.png
21769:
description: 45741_male_outer_ExplorationSuit_M01_Types_ExplorationSuit_M01_Exo.png
iconFile: res:/UI/Asset/mannequin/outer/45741_male_outer_ExplorationSuit_M01_Types_ExplorationSuit_M01_Exo.png
21770:
description: 45742_male_outer_JacketMilM02_Types_JacketMilM02_exo.png
iconFile: res:/UI/Asset/mannequin/outer/45742_male_outer_JacketMilM02_Types_JacketMilM02_exo.png
21771:
description: 45743_male_TopMiddle_TshirtM01_Types_TshirtM01_Exo.png
iconFile: res:/UI/Asset/mannequin/topmiddle/45743_male_TopMiddle_TshirtM01_Types_TshirtM01_Exo.png
21772:
description: 45744_male_outer_LabCoatM01_Types_LabCoatM01_Exo.png
iconFile: res:/UI/Asset/mannequin/outer/45744_male_outer_LabCoatM01_Types_LabCoatM01_Exo.png
21773:
description: 45745_male_Accessories_Glasses_Glasses_Exo_M01_Types_Glasses_Exo_M01_clear.png
iconFile: res:/UI/Asset/mannequin/accessories_glasses/45745_male_Accessories_Glasses_Glasses_Exo_M01_Types_Glasses_Exo_M01_clear.png
21774:
description: Structure Moon Drilling Service Module
iconFile: res:/UI/Texture/Icons/128_64_1.png
21775:
description: 45736_female_Accessories_Glasses_Glasses_Exo_F01_Types_Glasses_Exo_F01_clear.png
iconFile: res:/UI/Asset/mannequin/accessories_glasses/45736_female_Accessories_Glasses_Glasses_Exo_F01_Types_Glasses_Exo_F01_clear.png
21778:
description: 46038_male_outer_ExplorationSuit_M01_Types_ExplorationSuit_M01_IGC.png
iconFile: res:/UI/Asset/mannequin/outer/46038_male_outer_ExplorationSuit_M01_Types_ExplorationSuit_M01_IGC.png
21779:
description: 46039_female_Outer_ExplorationSuit_F01_Types_ExplorationSuit_F01_IGC.png
iconFile: res:/UI/Asset/mannequin/outer/46039_female_Outer_ExplorationSuit_F01_Types_ExplorationSuit_F01_IGC.png
21780:
description: 46274_male_outer_JacketPrtm01_Types_JacketPrtm01_valkyrie
iconFile: res:/UI/Asset/mannequin/outer/46274_male_outer_JacketPrtm01_Types_JacketPrtm01_valkyrie.png
21781:
description: 46273_female_Outer_JacketPrtF01_Types_JacketPrtF01_valkyrie
iconFile: res:/UI/Asset/mannequin/outer/46273_female_Outer_JacketPrtF01_Types_JacketPrtF01_valkyrie.png
21783:
description: ReactionBackdrop
iconFile: res:/ui/texture/icons/reaction.png
21784:
description: Valkyrie Data Core
iconFile: res:/UI/Texture/Icons/Inventory/dataCore.png
21785:
description: Valkyrie Relic Vault
iconFile: res:/UI/Texture/Icons/Inventory/relicVault.png
21787:
description: refinery rig drill
iconFile: res:/UI/Texture/Icons/Modules/refinery_ChunkStabilization.png
21788:
description: refinery rig reactions
iconFile: res:/UI/Texture/Icons/Modules/refinery_MiningYield.png
21789:
description: refinery reaction module booster
iconFile: res:/UI/Texture/Icons/Modules/refinery_BoosterReactions.png
21790:
description: refinery module hybrid reactions
iconFile: res:/UI/Texture/Icons/Modules/refinery_HybridReactions.png
21791:
description: refinery module adv reactions
iconFile: res:/UI/Texture/Icons/Modules/refinery_T2Reactions.png
21792:
description: moon asteroid ubi
iconFile: res:/UI/Texture/Icons/Inventory/moonAsteroid_R4.png
21793:
description: moon asteroid com
iconFile: res:/UI/Texture/Icons/Inventory/moonAsteroid_R8.png
21794:
description: moon asteroid unc
iconFile: res:/UI/Texture/Icons/Inventory/moonAsteroid_R16.png
21795:
description: moon asteroid rar
iconFile: res:/UI/Texture/Icons/Inventory/moonAsteroid_R32.png
21796:
description: moon asteroid exc
iconFile: res:/UI/Texture/Icons/Inventory/moonAsteroid_R64.png
21797:
description: moon asteroid ubi jkpt
iconFile: res:/UI/Texture/Icons/Inventory/moonAsteroid_JackpotR4.png
21798:
description: moon asteroid com jkpt
iconFile: res:/UI/Texture/Icons/Inventory/moonAsteroid_JackpotR8.png
21799:
description: moon asteroid unc jkpt
iconFile: res:/UI/Texture/Icons/Inventory/moonAsteroid_JackpotR16.png
21800:
description: moon asteroid rar jkpt
iconFile: res:/UI/Texture/Icons/Inventory/moonAsteroid_JackpotR32.png
21801:
description: moon asteroid exc jkpt
iconFile: res:/UI/Texture/Icons/Inventory/moonAsteroid_JackpotR64.png
21802:
description: Icon for the Gallente Resource Wars corporation
iconFile: res:/ui/texture/corps/federalStrategicMateriel.png
21803:
description: Icon for the Amarr Resource Wars corporation
iconFile: res:/ui/texture/corps/imperialWarReserves.png
21804:
description: Icon for the Minmatar Resource Wars corporation
iconFile: res:/ui/texture/corps/republicFleetOrdnance.png
21805:
description: Icon for the Caldari Resource Wars corporation
iconFile: res:/ui/texture/corps/stateMilitaryStockpile.png
21807:
description: 46658_female_Outer_JacketAGF01_Types_JacketAGF01_Gallente_RW.png
iconFile: res:/UI/Asset/mannequin/outer/46658_female_Outer_JacketAGF01_Types_JacketAGF01_Gallente_RW.png
21808:
description: 46659_male_outer_JacketCMM01_Types_JacketCMM01_Caldari.png
iconFile: res:/UI/Asset/mannequin/outer/46659_male_outer_JacketCMM01_Types_JacketCMM01_Caldari.png
21809:
description: 46660_female_Outer_JacketAGF01_Types_JacketAGF01_Gallente.png
iconFile: res:/UI/Asset/mannequin/outer/46660_female_Outer_JacketAGF01_Types_JacketAGF01_Gallente.png
21810:
description: 46661_female_Outer_JacketCMF01_Types_JacketCMF01_Minmatar_RW.png
iconFile: res:/UI/Asset/mannequin/outer/46661_female_Outer_JacketCMF01_Types_JacketCMF01_Minmatar_RW.png
21811:
description: 46662_male_outer_JacketAGM01_Types_JacketAGM01_Amarr.png
iconFile: res:/UI/Asset/mannequin/outer/46662_male_outer_JacketAGM01_Types_JacketAGM01_Amarr.png
21812:
description: 46663_female_Outer_JacketAGF01_Types_JacketAGF01_Amarr.png
iconFile: res:/UI/Asset/mannequin/outer/46663_female_Outer_JacketAGF01_Types_JacketAGF01_Amarr.png
21813:
description: 46664_male_outer_JacketCMM01_Types_JacketCMM01_Minmatar.png
iconFile: res:/UI/Asset/mannequin/outer/46664_male_outer_JacketCMM01_Types_JacketCMM01_Minmatar.png
21814:
description: 46665_male_outer_JacketAGM01_Types_JacketAGM01_Gallente.pn
iconFile: res:/UI/Asset/mannequin/outer/46665_male_outer_JacketAGM01_Types_JacketAGM01_Gallente.png
21815:
description: 46666_male_outer_JacketAGM01_Types_JacketAGM01_Amarr_RW.png
iconFile: res:/UI/Asset/mannequin/outer/46666_male_outer_JacketAGM01_Types_JacketAGM01_Amarr_RW.png
21816:
description: 46667_male_outer_JacketAGM01_Types_JacketAGM01_Gallente_RW.png
iconFile: res:/UI/Asset/mannequin/outer/46667_male_outer_JacketAGM01_Types_JacketAGM01_Gallente_RW.png
21817:
description: 46668_female_Outer_JacketAGF01_Types_JacketAGF01_Amarr_RW.png
iconFile: res:/UI/Asset/mannequin/outer/46668_female_Outer_JacketAGF01_Types_JacketAGF01_Amarr_RW.png
21818:
description: 46669_female_Outer_JacketCMF01_Types_JacketCMF01_Caldari.png
iconFile: res:/UI/Asset/mannequin/outer/46669_female_Outer_JacketCMF01_Types_JacketCMF01_Caldari.png
21819:
description: 46674_male_outer_JacketCMM01_Types_JacketCMM01_Minmatar_RW.png
iconFile: res:/UI/Asset/mannequin/outer/46674_male_outer_JacketCMM01_Types_JacketCMM01_Minmatar_RW.png
21820:
description: 46671_female_Outer_JacketCMF01_Types_JacketCMF01_Caldari_RW.png
iconFile: res:/UI/Asset/mannequin/outer/46671_female_Outer_JacketCMF01_Types_JacketCMF01_Caldari_RW.png
21821:
description: 46672_male_outer_JacketCMM01_Types_JacketCMM01_Caldari_RW.png
iconFile: res:/UI/Asset/mannequin/outer/46672_male_outer_JacketCMM01_Types_JacketCMM01_Caldari_RW.png
21822:
description: 46673_female_Outer_JacketCMF01_Types_JacketCMF01_Minmatar.png
iconFile: res:/UI/Asset/mannequin/outer/46673_female_Outer_JacketCMF01_Types_JacketCMF01_Minmatar.png
21823:
description: Resource Wars Asteroid Icon
iconFile: res:/UI/Texture/Icons/Inventory/rwAsteroid.png
21829:
description: Biochemical materials
iconFile: res:/ui/texture/icons/Inventory/biochemMaterials.png
21830:
description: Amarr RW reward crate icon
iconFile: res:/UI/Texture/Icons/Inventory/crateAmarr.png
21831:
description: Caldari RW reward crate icon
iconFile: res:/UI/Texture/Icons/Inventory/crateCaldari.png
21832:
description: Gallente RW reward crate icon
iconFile: res:/UI/Texture/Icons/Inventory/crateGallente.png
21833:
description: Minmatar RW reward crate icon
iconFile: res:/UI/Texture/Icons/Inventory/crateMinmatar.png

1
scripts/icons.json Normal file

File diff suppressed because one or more lines are too long

View File

@@ -192,7 +192,7 @@ def main(db, json_path):
for row in data["evetypes"]:
if (row["published"]
or row['groupID'] == 1306 # group Ship Modifiers, for items like tactical t3 ship modes
or row['typeID'] in (3638, 3634, 3636, 3640) # Civilian weapons
or row['typeName'].startswith('Civilian') # Civilian weapons
or row['typeID'] in (41549, 41548, 41551,41550) # Micro Bombs (Fighters)
):
eveTypes.add(row["typeID"])
@@ -213,6 +213,9 @@ def main(db, json_path):
for row in table:
# We don't care about some kind of rows, filter it out if so
if not isIgnored(jsonName, row):
if jsonName == 'evetypes' and row["typeName"].startswith('Civilian'): # Apparently people really want Civilian modules available
row["published"] = True
instance = tables[jsonName]()
# fix for issue 80
if jsonName is "icons" and "res:/ui/texture/icons/" in str(row["iconFile"]).lower():

View File

@@ -226,10 +226,6 @@ class Market(object):
"Guristas Shuttle" : False,
"Mobile Decoy Unit" : False, # Seems to be left over test mod for deployables
"Tournament Micro Jump Unit" : False, # Normally seen only on tournament arenas
"Civilian Gatling Railgun" : True,
"Civilian Gatling Pulse Laser" : True,
"Civilian Gatling Autocannon" : True,
"Civilian Light Electron Blaster" : True,
}
# do not publish ships that we convert

View File

@@ -8,9 +8,9 @@ deps =
-rrequirements.txt
-rrequirements_test.txt
basepython = python2.7
commands = py.test -vv --cov Pyfa tests/
commands = py.test -vv --cov Pyfa tests2/
[testenv:pep8]
deps = flake8
# TODO: Remove E731 and convert lambdas to defs
commands = flake8 --exclude=.svn,CVS,.bzr,.hg,.git,__pycache__,venv,tests,.tox,build,dist,__init__.py,floatspin.py --ignore=E121,E126,E127,E128,E203,E731,F401 service gui eos utils config.py pyfa.py --max-line-length=165
commands = flake8 --exclude=.svn,CVS,.bzr,.hg,.git,__pycache__,venv,tests,.tox,build,dist,__init__.py,floatspin.py --ignore=E121,E126,E127,E128,E203,E731,F401,E722,E741 service gui eos utils config.py pyfa.py --max-line-length=165