diff --git a/eos/db/migrations/upgrade11.py b/eos/db/migrations/upgrade11.py new file mode 100644 index 000000000..7265e064a --- /dev/null +++ b/eos/db/migrations/upgrade11.py @@ -0,0 +1,116 @@ +""" +Migration 11 + +- Converts modules based on December Release 2015 Tiericide + Some modules have been unpublished (and unpublished module attributes are removed + from database), which causes pyfa to crash. We therefore replace these + modules with their new replacements +""" + + +CONVERSIONS = { + 16467: ( # Medium Gremlin Compact Energy Neutralizer + 16471, # Medium Unstable Power Fluctuator I + ), + 22947: ( # 'Beatnik' Small Remote Armor Repairer + 23414, # 'Brotherhood' Small Remote Armor Repairer + ), + 8295: ( # Type-D Restrained Shield Flux Coil + 8293, # Beta Reactor Control: Shield Flux I + ), + 16499: ( # Heavy Knave Scoped Energy Nosferatu + 16501, # E500 Prototype Energy Vampire + ), + 16477: ( # Heavy Infectious Scoped Energy Neutralizer + 16473, # Heavy Rudimentary Energy Destabilizer I + ), + 16475: ( # Heavy Gremlin Compact Energy Neutralizer + 16479, # Heavy Unstable Power Fluctuator I + ), + 16447: ( # Medium Solace Scoped Remote Armor Repairer + 16445, # Medium 'Arup' Remote Armor Repairer + ), + 508: ( # 'Basic' Shield Flux Coil + 8325, # Alpha Reactor Shield Flux + 8329, # Marked Generator Refitting: Shield Flux + 8323, # Partial Power Plant Manager: Shield Flux + 8327, # Type-E Power Core Modification: Shield Flux + ), + 1419: ( # 'Basic' Shield Power Relay + 8341, # Alpha Reactor Shield Power Relay + 8345, # Marked Generator Refitting: Shield Power Relay + 8339, # Partial Power Plant Manager: Shield Power Relay + 8343, # Type-E Power Core Modification: Shield Power Relay + ), + 16439: ( # Small Solace Scoped Remote Armor Repairer + 16437, # Small 'Arup' Remote Armor Repairer + ), + 16505: ( # Medium Ghoul Compact Energy Nosferatu + 16511, # Medium Diminishing Power System Drain I + ), + 8297: ( # Mark I Compact Shield Flux Coil + 8291, # Local Power Plant Manager: Reaction Shield Flux I + ), + 16455: ( # Large Solace Scoped Remote Armor Repairer + 16453, # Large 'Arup' Remote Armor Repairer + ), + 6485: ( # M51 Benefactor Compact Shield Recharger + 6491, # Passive Barrier Compensator I + 6489, # 'Benefactor' Ward Reconstructor + 6487, # Supplemental Screen Generator I + ), + 5137: ( # Small Knave Scoped Energy Nosferatu + 5135, # E5 Prototype Energy Vampire + ), + 8579: ( # Medium Murky Compact Remote Shield Booster + 8581, # Medium 'Atonement' Remote Shield Booster + ), + 8531: ( # Small Murky Compact Remote Shield Booster + 8533, # Small 'Atonement' Remote Shield Booster + ), + 16497: ( # Heavy Ghoul Compact Energy Nosferatu + 16503, # Heavy Diminishing Power System Drain I + ), + 4477: ( # Small Gremlin Compact Energy Neutralizer + 4475, # Small Unstable Power Fluctuator I + ), + 8337: ( # Mark I Compact Shield Power Relay + 8331, # Local Power Plant Manager: Reaction Shield Power Relay I + ), + 23416: ( # 'Peace' Large Remote Armor Repairer + 22951, # 'Pacifier' Large Remote Armor Repairer + ), + 5141: ( # Small Ghoul Compact Energy Nosferatu + 5139, # Small Diminishing Power System Drain I + ), + 4471: ( # Small Infectious Scoped Energy Neutralizer + 4473, # Small Rudimentary Energy Destabilizer I + ), + 16469: ( # Medium Infectious Scoped Energy Neutralizer + 16465, # Medium Rudimentary Energy Destabilizer I + ), + 8335: ( # Type-D Restrained Shield Power Relay + 8333, # Beta Reactor Control: Shield Power Relay I + ), + 405: ( # 'Micro' Remote Shield Booster + 8631, # Micro Asymmetric Remote Shield Booster + 8627, # Micro Murky Remote Shield Booster + 8629, # Micro 'Atonement' Remote Shield Booster + 8633, # Micro S95a Remote Shield Booster + ), + 8635: ( # Large Murky Compact Remote Shield Booster + 8637, # Large 'Atonement' Remote Shield Booster + ), + 16507: ( # Medium Knave Scoped Energy Nosferatu + 16509, # E50 Prototype Energy Vampire + ), +} + +def upgrade(saveddata_engine): + + # Convert modules + for replacement_item, list in CONVERSIONS.iteritems(): + for retired_item in list: + saveddata_engine.execute('UPDATE "modules" SET "itemID" = ? WHERE "itemID" = ?', (replacement_item, retired_item)) + saveddata_engine.execute('UPDATE "cargo" SET "itemID" = ? WHERE "itemID" = ?', (replacement_item, retired_item)) + diff --git a/eos/effects/armorrepairprojectorfalloffbonus.py b/eos/effects/armorrepairprojectorfalloffbonus.py new file mode 100644 index 000000000..405f9802a --- /dev/null +++ b/eos/effects/armorrepairprojectorfalloffbonus.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer", "falloffEffectiveness", src.getModifiedItemAttr("falloffBonus")) diff --git a/eos/effects/carrieramarrarmortransferfalloff3.py b/eos/effects/carrieramarrarmortransferfalloff3.py new file mode 100644 index 000000000..5eb8e46c3 --- /dev/null +++ b/eos/effects/carrieramarrarmortransferfalloff3.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Remote Armor Repair Systems"), "falloffEffectiveness", src.getModifiedItemAttr("carrierAmarrBonus3"), skill="Amarr Carrier") diff --git a/eos/effects/carriercaldarishieldtransferfalloff3.py b/eos/effects/carriercaldarishieldtransferfalloff3.py new file mode 100644 index 000000000..db9443da5 --- /dev/null +++ b/eos/effects/carriercaldarishieldtransferfalloff3.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems"), "falloffEffectiveness", src.getModifiedItemAttr("carrierCaldariBonus3"), skill="Caldari Carrier") diff --git a/eos/effects/carriergallentearmorshieldtransferfalloff3.py b/eos/effects/carriergallentearmorshieldtransferfalloff3.py new file mode 100644 index 000000000..371a664cf --- /dev/null +++ b/eos/effects/carriergallentearmorshieldtransferfalloff3.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems") or mod.item.requiresSkill("Capital Remote Armor Repair Systems"), "falloffEffectiveness", src.getModifiedItemAttr("carrierGallenteBonus3"), skill="Gallente Carrier") \ No newline at end of file diff --git a/eos/effects/carrierminmatararmorshieldtransferfalloff3.py b/eos/effects/carrierminmatararmorshieldtransferfalloff3.py new file mode 100644 index 000000000..a37581c56 --- /dev/null +++ b/eos/effects/carrierminmatararmorshieldtransferfalloff3.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems") or mod.item.requiresSkill("Capital Remote Armor Repair Systems"), "falloffEffectiveness", src.getModifiedItemAttr("carrierMinmatarBonus3"), skill="Minmatar Carrier") diff --git a/eos/effects/commandbonustdmultiplywithcommandbonushidden.py b/eos/effects/commandbonustdmultiplywithcommandbonushidden.py index 215d539b9..11987a66b 100644 --- a/eos/effects/commandbonustdmultiplywithcommandbonushidden.py +++ b/eos/effects/commandbonustdmultiplywithcommandbonushidden.py @@ -7,6 +7,14 @@ gangBoost = "ewarStrTD" type = "active", "gang" def handler(fit, module, context): if "gang" not in context: return - for bonus in ("maxRangeBonus", "falloffBonus", "trackingSpeedBonus"): + for bonus in ( + "missileVelocityBonus", + "explosionDelayBonus", + "aoeVelocityBonus", + "falloffBonus", + "maxRangeBonus", + "aoeCloudSizeBonus", + "trackingSpeedBonus" + ): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), bonus, module.getModifiedItemAttr("commandBonusTD")) diff --git a/eos/effects/commandbonustpmultiplywithcommandbonushidden.py b/eos/effects/commandbonustpmultiplywithcommandbonushidden.py index ba2627080..f3ae01698 100644 --- a/eos/effects/commandbonustpmultiplywithcommandbonushidden.py +++ b/eos/effects/commandbonustpmultiplywithcommandbonushidden.py @@ -7,6 +7,6 @@ gangBoost = "ewarStrTP" type = "active", "gang" def handler(fit, module, context): if "gang" not in context: return - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Target Painter", + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Target Painting"), "signatureRadiusBonus", module.getModifiedItemAttr("commandBonusTP"), stackingPenalties = True) diff --git a/eos/effects/dronehullrepairbonuseffect.py b/eos/effects/dronehullrepairbonuseffect.py new file mode 100644 index 000000000..2cb661aa4 --- /dev/null +++ b/eos/effects/dronehullrepairbonuseffect.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == "Logistic Drone", "structureDamageAmount", src.getModifiedItemAttr("droneArmorDamageAmountBonus")) \ No newline at end of file diff --git a/eos/effects/elitebonuscommanddestroyerarmored1.py b/eos/effects/elitebonuscommanddestroyerarmored1.py new file mode 100644 index 000000000..04cd1f32d --- /dev/null +++ b/eos/effects/elitebonuscommanddestroyerarmored1.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers") diff --git a/eos/effects/elitebonuscommanddestroyerinfo1.py b/eos/effects/elitebonuscommanddestroyerinfo1.py new file mode 100644 index 000000000..6ed3a7a9e --- /dev/null +++ b/eos/effects/elitebonuscommanddestroyerinfo1.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers") diff --git a/eos/effects/elitebonuscommanddestroyerinfohidden1.py b/eos/effects/elitebonuscommanddestroyerinfohidden1.py new file mode 100644 index 000000000..9ebc8481c --- /dev/null +++ b/eos/effects/elitebonuscommanddestroyerinfohidden1.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"), "commandBonusHidden", src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers") diff --git a/eos/effects/elitebonuscommanddestroyermjfgspool2.py b/eos/effects/elitebonuscommanddestroyermjfgspool2.py new file mode 100644 index 000000000..29b82ae42 --- /dev/null +++ b/eos/effects/elitebonuscommanddestroyermjfgspool2.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Micro Jump Drive Operation"), "duration", src.getModifiedItemAttr("eliteBonusCommandDestroyer2"), skill="Command Destroyers") diff --git a/eos/effects/elitebonuscommanddestroyermwdsigradius3.py b/eos/effects/elitebonuscommanddestroyermwdsigradius3.py new file mode 100644 index 000000000..4b9926f91 --- /dev/null +++ b/eos/effects/elitebonuscommanddestroyermwdsigradius3.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"), "signatureRadiusBonus", src.getModifiedItemAttr("eliteBonusCommandDestroyer3"), skill="Command Destroyers") diff --git a/eos/effects/elitebonuscommanddestroyersiege1.py b/eos/effects/elitebonuscommanddestroyersiege1.py new file mode 100644 index 000000000..8b24b7e81 --- /dev/null +++ b/eos/effects/elitebonuscommanddestroyersiege1.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Siege Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers") diff --git a/eos/effects/elitebonuscommanddestroyerskirmish1.py b/eos/effects/elitebonuscommanddestroyerskirmish1.py new file mode 100644 index 000000000..d7e1c07dd --- /dev/null +++ b/eos/effects/elitebonuscommanddestroyerskirmish1.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers") diff --git a/eos/effects/elitebonuselectronicattackshipenergyneutrange1.py b/eos/effects/elitebonuselectronicattackshipenergyneutrange1.py index d443e20c9..867982c0b 100644 --- a/eos/effects/elitebonuselectronicattackshipenergyneutrange1.py +++ b/eos/effects/elitebonuselectronicattackshipenergyneutrange1.py @@ -4,5 +4,5 @@ # Ship: Sentinel type = "passive" def handler(fit, ship, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Destabilizer", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "energyDestabilizationRange", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip1"), skill="Electronic Attack Ships") diff --git a/eos/effects/elitebonuselectronicattackshipenergyvampirerange1.py b/eos/effects/elitebonuselectronicattackshipenergyvampirerange1.py index 9bc17e752..7974ce9ca 100644 --- a/eos/effects/elitebonuselectronicattackshipenergyvampirerange1.py +++ b/eos/effects/elitebonuselectronicattackshipenergyvampirerange1.py @@ -4,5 +4,5 @@ # Ship: Sentinel type = "passive" def handler(fit, ship, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Vampire", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "powerTransferRange", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip1"), skill="Electronic Attack Ships") diff --git a/eos/effects/elitebonuslogifrigarmorhp2.py b/eos/effects/elitebonuslogifrigarmorhp2.py new file mode 100644 index 000000000..687b4feee --- /dev/null +++ b/eos/effects/elitebonuslogifrigarmorhp2.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.ship.boostItemAttr("armorHP", src.getModifiedItemAttr("eliteBonusLogiFrig2"), skill="Logistics Frigates") diff --git a/eos/effects/elitebonuslogifrigarmorrepspeedcap1.py b/eos/effects/elitebonuslogifrigarmorrepspeedcap1.py new file mode 100644 index 000000000..8347b1b6f --- /dev/null +++ b/eos/effects/elitebonuslogifrigarmorrepspeedcap1.py @@ -0,0 +1,4 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "capacitorNeed", src.getModifiedItemAttr("eliteBonusLogiFrig1"), skill="Logistics Frigates") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "duration", src.getModifiedItemAttr("eliteBonusLogiFrig1"), skill="Logistics Frigates") diff --git a/eos/effects/elitebonuslogifrigshieldhp2.py b/eos/effects/elitebonuslogifrigshieldhp2.py new file mode 100644 index 000000000..932285db4 --- /dev/null +++ b/eos/effects/elitebonuslogifrigshieldhp2.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.ship.boostItemAttr("shieldCapacity", src.getModifiedItemAttr("eliteBonusLogiFrig2"), skill="Logistics Frigates") diff --git a/eos/effects/elitebonuslogifrigshieldrepspeedcap1.py b/eos/effects/elitebonuslogifrigshieldrepspeedcap1.py new file mode 100644 index 000000000..492324ce8 --- /dev/null +++ b/eos/effects/elitebonuslogifrigshieldrepspeedcap1.py @@ -0,0 +1,4 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "duration", src.getModifiedItemAttr("eliteBonusLogiFrig1"), skill="Logistics Frigates") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "capacitorNeed", src.getModifiedItemAttr("eliteBonusLogiFrig1"), skill="Logistics Frigates") diff --git a/eos/effects/elitebonuslogifrigsignature2.py b/eos/effects/elitebonuslogifrigsignature2.py new file mode 100644 index 000000000..a72670464 --- /dev/null +++ b/eos/effects/elitebonuslogifrigsignature2.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.ship.boostItemAttr("signatureRadius", src.getModifiedItemAttr("eliteBonusLogiFrig2"), skill="Logistics Frigates") diff --git a/eos/effects/elitebonuslogisticenergytransfercapneed1.py b/eos/effects/elitebonuslogisticenergytransfercapneed1.py index a2978184d..88d7eabb4 100644 --- a/eos/effects/elitebonuslogisticenergytransfercapneed1.py +++ b/eos/effects/elitebonuslogisticenergytransfercapneed1.py @@ -5,4 +5,4 @@ type = "passive" def handler(fit, ship, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Capacitor Transmitter", - "capacitorNeed", ship.getModifiedItemAttr("eliteBonusLogistics1"), skill="Logistics") + "capacitorNeed", ship.getModifiedItemAttr("eliteBonusLogistics1"), skill="Logistics Cruisers") diff --git a/eos/effects/elitebonuslogisticenergytransfercapneed2.py b/eos/effects/elitebonuslogisticenergytransfercapneed2.py index 9b31da9fe..1c0760ea6 100644 --- a/eos/effects/elitebonuslogisticenergytransfercapneed2.py +++ b/eos/effects/elitebonuslogisticenergytransfercapneed2.py @@ -6,4 +6,4 @@ type = "passive" def handler(fit, ship, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Capacitor Transmitter", - "capacitorNeed", ship.getModifiedItemAttr("eliteBonusLogistics2"), skill="Logistics") + "capacitorNeed", ship.getModifiedItemAttr("eliteBonusLogistics2"), skill="Logistics Cruisers") diff --git a/eos/effects/elitebonuslogisticremotearmorrepaircapneed1.py b/eos/effects/elitebonuslogisticremotearmorrepaircapneed1.py index e03cbf3a1..7f4e10117 100644 --- a/eos/effects/elitebonuslogisticremotearmorrepaircapneed1.py +++ b/eos/effects/elitebonuslogisticremotearmorrepaircapneed1.py @@ -5,4 +5,4 @@ type = "passive" def handler(fit, ship, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer", - "capacitorNeed", ship.getModifiedItemAttr("eliteBonusLogistics1"), skill="Logistics") + "capacitorNeed", ship.getModifiedItemAttr("eliteBonusLogistics1"), skill="Logistics Cruisers") diff --git a/eos/effects/elitebonuslogisticremotearmorrepaircapneed2.py b/eos/effects/elitebonuslogisticremotearmorrepaircapneed2.py index 1e05d0d22..7e39fddbb 100644 --- a/eos/effects/elitebonuslogisticremotearmorrepaircapneed2.py +++ b/eos/effects/elitebonuslogisticremotearmorrepaircapneed2.py @@ -5,4 +5,4 @@ type = "passive" def handler(fit, ship, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer", - "capacitorNeed", ship.getModifiedItemAttr("eliteBonusLogistics2"), skill="Logistics") + "capacitorNeed", ship.getModifiedItemAttr("eliteBonusLogistics2"), skill="Logistics Cruisers") diff --git a/eos/effects/elitebonuslogisticshieldtransfercapneed1.py b/eos/effects/elitebonuslogisticshieldtransfercapneed1.py index 40cf695d8..d0024995a 100644 --- a/eos/effects/elitebonuslogisticshieldtransfercapneed1.py +++ b/eos/effects/elitebonuslogisticshieldtransfercapneed1.py @@ -6,4 +6,4 @@ type = "passive" def handler(fit, ship, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Shield Booster", - "capacitorNeed", ship.getModifiedItemAttr("eliteBonusLogistics1"), skill="Logistics") + "capacitorNeed", ship.getModifiedItemAttr("eliteBonusLogistics1"), skill="Logistics Cruisers") diff --git a/eos/effects/elitebonuslogisticshieldtransfercapneed2.py b/eos/effects/elitebonuslogisticshieldtransfercapneed2.py index b94f69ca7..7e731892d 100644 --- a/eos/effects/elitebonuslogisticshieldtransfercapneed2.py +++ b/eos/effects/elitebonuslogisticshieldtransfercapneed2.py @@ -5,4 +5,4 @@ type = "passive" def handler(fit, ship, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Shield Booster", - "capacitorNeed", ship.getModifiedItemAttr("eliteBonusLogistics2"), skill="Logistics") + "capacitorNeed", ship.getModifiedItemAttr("eliteBonusLogistics2"), skill="Logistics Cruisers") diff --git a/eos/effects/elitebonuslogisticstrackinglinkfalloffbonus1.py b/eos/effects/elitebonuslogisticstrackinglinkfalloffbonus1.py index d9da9e025..55d0519ca 100644 --- a/eos/effects/elitebonuslogisticstrackinglinkfalloffbonus1.py +++ b/eos/effects/elitebonuslogisticstrackinglinkfalloffbonus1.py @@ -5,4 +5,4 @@ type = "passive" def handler(fit, ship, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer", - "falloffBonus", ship.getModifiedItemAttr("eliteBonusLogistics1"), skill="Logistics") + "falloffBonus", ship.getModifiedItemAttr("eliteBonusLogistics1"), skill="Logistics Cruisers") diff --git a/eos/effects/elitebonuslogisticstrackinglinkfalloffbonus2.py b/eos/effects/elitebonuslogisticstrackinglinkfalloffbonus2.py index 48c6bc5c6..108e1aa49 100644 --- a/eos/effects/elitebonuslogisticstrackinglinkfalloffbonus2.py +++ b/eos/effects/elitebonuslogisticstrackinglinkfalloffbonus2.py @@ -5,4 +5,4 @@ type = "passive" def handler(fit, ship, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer", - "falloffBonus", ship.getModifiedItemAttr("eliteBonusLogistics2"), skill="Logistics") + "falloffBonus", ship.getModifiedItemAttr("eliteBonusLogistics2"), skill="Logistics Cruisers") diff --git a/eos/effects/elitebonuslogisticstrackinglinkmaxrangebonus1.py b/eos/effects/elitebonuslogisticstrackinglinkmaxrangebonus1.py index ecbd5b370..df9ebe8e4 100644 --- a/eos/effects/elitebonuslogisticstrackinglinkmaxrangebonus1.py +++ b/eos/effects/elitebonuslogisticstrackinglinkmaxrangebonus1.py @@ -5,4 +5,4 @@ type = "passive" def handler(fit, ship, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer", - "maxRangeBonus", ship.getModifiedItemAttr("eliteBonusLogistics1"), skill="Logistics") + "maxRangeBonus", ship.getModifiedItemAttr("eliteBonusLogistics1"), skill="Logistics Cruisers") diff --git a/eos/effects/elitebonuslogisticstrackinglinkmaxrangebonus2.py b/eos/effects/elitebonuslogisticstrackinglinkmaxrangebonus2.py index 280cb4ac3..80434490a 100644 --- a/eos/effects/elitebonuslogisticstrackinglinkmaxrangebonus2.py +++ b/eos/effects/elitebonuslogisticstrackinglinkmaxrangebonus2.py @@ -5,4 +5,4 @@ type = "passive" def handler(fit, ship, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer", - "maxRangeBonus", ship.getModifiedItemAttr("eliteBonusLogistics2"), skill="Logistics") + "maxRangeBonus", ship.getModifiedItemAttr("eliteBonusLogistics2"), skill="Logistics Cruisers") diff --git a/eos/effects/elitebonuslogisticstrackinglinktrackingspeedbonus1.py b/eos/effects/elitebonuslogisticstrackinglinktrackingspeedbonus1.py index c7a42d460..22a21a78f 100644 --- a/eos/effects/elitebonuslogisticstrackinglinktrackingspeedbonus1.py +++ b/eos/effects/elitebonuslogisticstrackinglinktrackingspeedbonus1.py @@ -5,4 +5,4 @@ type = "passive" def handler(fit, ship, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer", - "trackingSpeedBonus", ship.getModifiedItemAttr("eliteBonusLogistics1"), skill="Logistics") + "trackingSpeedBonus", ship.getModifiedItemAttr("eliteBonusLogistics1"), skill="Logistics Cruisers") diff --git a/eos/effects/elitebonuslogisticstrackinglinktrackingspeedbonus2.py b/eos/effects/elitebonuslogisticstrackinglinktrackingspeedbonus2.py index 1ab6ad285..9b1c659b9 100644 --- a/eos/effects/elitebonuslogisticstrackinglinktrackingspeedbonus2.py +++ b/eos/effects/elitebonuslogisticstrackinglinktrackingspeedbonus2.py @@ -5,4 +5,4 @@ type = "passive" def handler(fit, ship, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer", - "trackingSpeedBonus", ship.getModifiedItemAttr("eliteBonusLogistics2"), skill="Logistics") + "trackingSpeedBonus", ship.getModifiedItemAttr("eliteBonusLogistics2"), skill="Logistics Cruisers") diff --git a/eos/effects/elitebonusvampiredrainamount2.py b/eos/effects/elitebonusvampiredrainamount2.py index 96b934a87..267e5c7d7 100644 --- a/eos/effects/elitebonusvampiredrainamount2.py +++ b/eos/effects/elitebonusvampiredrainamount2.py @@ -5,5 +5,5 @@ # Ship: Pilgrim type = "passive" def handler(fit, ship, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Vampire", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "powerTransferAmount", ship.getModifiedItemAttr("eliteBonusReconShip2"), skill="Recon Ships") diff --git a/eos/effects/elitereconbonusenergyneutamount2.py b/eos/effects/elitereconbonusenergyneutamount2.py index 940318998..6570460dd 100644 --- a/eos/effects/elitereconbonusenergyneutamount2.py +++ b/eos/effects/elitereconbonusenergyneutamount2.py @@ -5,5 +5,5 @@ # Ship: Pilgrim type = "passive" def handler(fit, ship, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Destabilizer", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "energyDestabilizationAmount", ship.getModifiedItemAttr("eliteBonusReconShip2"), skill="Recon Ships") diff --git a/eos/effects/elitereconbonusenergyneutrange1.py b/eos/effects/elitereconbonusenergyneutrange1.py index 566b9e868..12f4b54f2 100644 --- a/eos/effects/elitereconbonusenergyneutrange1.py +++ b/eos/effects/elitereconbonusenergyneutrange1.py @@ -4,5 +4,5 @@ # Ship: Curse type = "passive" def handler(fit, ship, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Destabilizer", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "energyDestabilizationRange", ship.getModifiedItemAttr("eliteBonusReconShip1"), skill="Recon Ships") diff --git a/eos/effects/elitereconbonusneutrange3.py b/eos/effects/elitereconbonusneutrange3.py index 4bb877b0b..e203118c8 100644 --- a/eos/effects/elitereconbonusneutrange3.py +++ b/eos/effects/elitereconbonusneutrange3.py @@ -4,5 +4,5 @@ # Ship: Pilgrim type = "passive" def handler(fit, ship, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Destabilizer", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "energyDestabilizationRange", ship.getModifiedItemAttr("eliteBonusReconShip3"), skill="Recon Ships") diff --git a/eos/effects/elitereconbonusvamprange3.py b/eos/effects/elitereconbonusvamprange3.py index c870e93ae..9b944f150 100644 --- a/eos/effects/elitereconbonusvamprange3.py +++ b/eos/effects/elitereconbonusvamprange3.py @@ -4,5 +4,5 @@ # Ship: Pilgrim type = "passive" def handler(fit, ship, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Vampire", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "powerTransferRange", ship.getModifiedItemAttr("eliteBonusReconShip3"), skill="Recon Ships") diff --git a/eos/effects/elitereconenergyvampirerangebonus1.py b/eos/effects/elitereconenergyvampirerangebonus1.py index 23ccc34cc..387740b25 100644 --- a/eos/effects/elitereconenergyvampirerangebonus1.py +++ b/eos/effects/elitereconenergyvampirerangebonus1.py @@ -4,5 +4,5 @@ # Ship: Curse type = "passive" def handler(fit, ship, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Vampire", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "powerTransferRange", ship.getModifiedItemAttr("eliteBonusReconShip1"), skill="Recon Ships") diff --git a/eos/effects/energyneutralizerfalloff.py b/eos/effects/energyneutralizerfalloff.py new file mode 100644 index 000000000..9346d4d85 --- /dev/null +++ b/eos/effects/energyneutralizerfalloff.py @@ -0,0 +1,9 @@ +from eos.types import State +type = "active", "projected" +def handler(fit, container, context): + if "projected" in context and ((hasattr(container, "state") \ + and container.state >= State.ACTIVE) or hasattr(container, "amountActive")): + multiplier = container.amountActive if hasattr(container, "amountActive") else 1 + amount = container.getModifiedItemAttr("energyDestabilizationAmount") + time = container.getModifiedItemAttr("duration") + fit.addDrain(time, amount * multiplier, 0) diff --git a/eos/effects/energynosferatufalloff.py b/eos/effects/energynosferatufalloff.py new file mode 100644 index 000000000..59b2bffa9 --- /dev/null +++ b/eos/effects/energynosferatufalloff.py @@ -0,0 +1,9 @@ +type = "active", "projected" +runTime = "late" +def handler(fit, module, context): + amount = module.getModifiedItemAttr("powerTransferAmount") + time = module.getModifiedItemAttr("duration") + if "projected" in context: + fit.addDrain(time, amount, 0) + elif "module" in context: + module.itemModifiedAttributes.force("capacitorNeed", -amount) \ No newline at end of file diff --git a/eos/effects/energytransferarraymaxrangebonus.py b/eos/effects/energytransferarraymaxrangebonus.py index 67a59b742..3ec67bee9 100644 --- a/eos/effects/energytransferarraymaxrangebonus.py +++ b/eos/effects/energytransferarraymaxrangebonus.py @@ -6,4 +6,4 @@ type = "passive" def handler(fit, ship, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Capacitor Transmitter", - "powerTransferRange", ship.getModifiedItemAttr("maxRangeBonus")) + "powerTransferRange", ship.getModifiedItemAttr("maxRangeBonus2")) diff --git a/eos/effects/ewgrouptdmaxrangebonus.py b/eos/effects/ewgrouptdmaxrangebonus.py index 33c9d6329..e085e9f10 100644 --- a/eos/effects/ewgrouptdmaxrangebonus.py +++ b/eos/effects/ewgrouptdmaxrangebonus.py @@ -4,5 +4,5 @@ # Implants named like: grade Centurion (10 of 12) type = "passive" def handler(fit, implant, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tracking Disruptor", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Weapon Disruptor", "maxRange", implant.getModifiedItemAttr("rangeSkillBonus")) \ No newline at end of file diff --git a/eos/effects/ewskillguidancedisruptionbonus.py b/eos/effects/ewskillguidancedisruptionbonus.py new file mode 100644 index 000000000..994070ac0 --- /dev/null +++ b/eos/effects/ewskillguidancedisruptionbonus.py @@ -0,0 +1,11 @@ +type = "passive" +def handler(fit, src, context): + level = src.level if "skill" in context else 1 + for attr in ( + "explosionDelayBonus", + "aoeVelocityBonus", + "aoeCloudSizeBonus", + "missileVelocityBonus" + ): + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), + attr, src.getModifiedItemAttr("scanSkillEwStrengthBonus") * level) \ No newline at end of file diff --git a/eos/effects/ewskilltdfalloffbonus.py b/eos/effects/ewskilltdfalloffbonus.py index 1a11f96af..60b860ea0 100644 --- a/eos/effects/ewskilltdfalloffbonus.py +++ b/eos/effects/ewskilltdfalloffbonus.py @@ -4,5 +4,5 @@ # Skill: Frequency Modulation type = "passive" def handler(fit, skill, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tracking Disruptor", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Weapon Disruptor", "falloff", skill.getModifiedItemAttr("falloffBonus") * skill.level) \ No newline at end of file diff --git a/eos/effects/ewskilltdmaxrangebonus.py b/eos/effects/ewskilltdmaxrangebonus.py index 73a80f057..03f87118a 100644 --- a/eos/effects/ewskilltdmaxrangebonus.py +++ b/eos/effects/ewskilltdmaxrangebonus.py @@ -6,6 +6,6 @@ type = "passive" def handler(fit, container, context): level = container.level if "skill" in context else 1 - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tracking Disruptor", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Weapon Disruptor", "maxRange", container.getModifiedItemAttr("rangeSkillBonus") * level, stackingPenalties = "skill" not in context) diff --git a/eos/effects/ewskilltrackingdisruptiontrackingspeedbonus.py b/eos/effects/ewskilltrackingdisruptiontrackingspeedbonus.py index 136f85162..65bba385e 100644 --- a/eos/effects/ewskilltrackingdisruptiontrackingspeedbonus.py +++ b/eos/effects/ewskilltrackingdisruptiontrackingspeedbonus.py @@ -6,5 +6,5 @@ type = "passive" def handler(fit, container, context): level = container.level if "skill" in context else 1 - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tracking Disruptor", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Weapon Disruptor", "trackingSpeedBonus", container.getModifiedItemAttr("scanSkillEwStrengthBonus") * level) diff --git a/eos/effects/expeditionfrigatebonusiceharvestingcycletime2.py b/eos/effects/expeditionfrigatebonusiceharvestingcycletime2.py new file mode 100644 index 000000000..0d8078335 --- /dev/null +++ b/eos/effects/expeditionfrigatebonusiceharvestingcycletime2.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Ice Harvesting"), "duration", src.getModifiedItemAttr("eliteBonusExpedition2"), skill="Expedition Frigates") diff --git a/eos/effects/expeditionfrigateshieldresistance1.py b/eos/effects/expeditionfrigateshieldresistance1.py new file mode 100644 index 000000000..463fe8028 --- /dev/null +++ b/eos/effects/expeditionfrigateshieldresistance1.py @@ -0,0 +1,6 @@ +type = "passive" +def handler(fit, src, context): + fit.ship.boostItemAttr("shieldThermalDamageResonance", src.getModifiedItemAttr("eliteBonusExpedition1"), skill="Expedition Frigates") + fit.ship.boostItemAttr("shieldKineticDamageResonance", src.getModifiedItemAttr("eliteBonusExpedition1"), skill="Expedition Frigates") + fit.ship.boostItemAttr("shieldExplosiveDamageResonance", src.getModifiedItemAttr("eliteBonusExpedition1"), skill="Expedition Frigates") + fit.ship.boostItemAttr("shieldEmDamageResonance", src.getModifiedItemAttr("eliteBonusExpedition1"), skill="Expedition Frigates") diff --git a/eos/effects/ganginformationwarfarerangebonuswithecmburst.py b/eos/effects/ganginformationwarfarerangebonuswithecmburst.py index ffbae0664..bdd216824 100644 --- a/eos/effects/ganginformationwarfarerangebonuswithecmburst.py +++ b/eos/effects/ganginformationwarfarerangebonuswithecmburst.py @@ -6,7 +6,7 @@ type = "gang", "active" gangBoost = "electronicMaxRange" def handler(fit, module, context): if "gang" not in context: return - groups = ("Target Painter", "Tracking Disruptor", "Remote Sensor Damper", "ECM", "ECM Burst") + groups = ("Target Painter", "Weapon Disruptor", "Remote Sensor Damper", "ECM", "ECM Burst") fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups, "maxRange", module.getModifiedItemAttr("commandBonus"), stackingPenalties = True) diff --git a/eos/effects/ganginformationwarfaresuperiorityall2.py b/eos/effects/ganginformationwarfaresuperiorityall2.py new file mode 100644 index 000000000..9dc9cd81c --- /dev/null +++ b/eos/effects/ganginformationwarfaresuperiorityall2.py @@ -0,0 +1,6 @@ +type = "active" +def handler(fit, module, context): + module.multiplyItemAttr("commandBonusTD", module.getModifiedItemAttr("commandBonusHidden")) + module.multiplyItemAttr("commandBonusECM", module.getModifiedItemAttr("commandBonusHidden")) + module.multiplyItemAttr("commandBonusRSD", module.getModifiedItemAttr("commandBonusHidden")) + module.multiplyItemAttr("commandBonusTP", module.getModifiedItemAttr("commandBonusHidden")) \ No newline at end of file diff --git a/eos/effects/ignorecloakvelocitypenalty.py b/eos/effects/ignorecloakvelocitypenalty.py new file mode 100644 index 000000000..7b0e9e80b --- /dev/null +++ b/eos/effects/ignorecloakvelocitypenalty.py @@ -0,0 +1,5 @@ +type = "passive" +runTime = "early" +def handler(fit, src, context): + fit.modules.filteredItemForce(lambda mod: mod.item.group.name == "Cloaking Device", + "maxVelocityBonus", src.getModifiedItemAttr("velocityPenaltyReduction")) diff --git a/eos/effects/miningfrigatebonusiceharvestingcycletime2.py b/eos/effects/miningfrigatebonusiceharvestingcycletime2.py new file mode 100644 index 000000000..2a25c961d --- /dev/null +++ b/eos/effects/miningfrigatebonusiceharvestingcycletime2.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Ice Harvesting"), "duration", src.getModifiedItemAttr("shipBonusOREfrig2"), skill="Mining Frigate") diff --git a/eos/effects/orecapitalshipshieldtransferfalloff.py b/eos/effects/orecapitalshipshieldtransferfalloff.py new file mode 100644 index 000000000..6e3e7245b --- /dev/null +++ b/eos/effects/orecapitalshipshieldtransferfalloff.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems"), "falloffEffectiveness", src.getModifiedItemAttr("shipBonusORECapital3"), skill="Capital Industrial Ships") diff --git a/eos/effects/overloadselfmissileguidancemodulebonus.py b/eos/effects/overloadselfmissileguidancemodulebonus.py new file mode 100644 index 000000000..09a75f04c --- /dev/null +++ b/eos/effects/overloadselfmissileguidancemodulebonus.py @@ -0,0 +1,9 @@ +type = "overheat" +def handler(fit, module, context): + for tgtAttr in ( + "aoeCloudSizeBonus", + "explosionDelayBonus", + "missileVelocityBonus", + "aoeVelocityBonus" + ): + module.boostItemAttr(tgtAttr, module.getModifiedItemAttr("overloadTrackingModuleStrengthBonus")) \ No newline at end of file diff --git a/eos/effects/remotearmorrepairfalloff.py b/eos/effects/remotearmorrepairfalloff.py new file mode 100644 index 000000000..98cdd3f67 --- /dev/null +++ b/eos/effects/remotearmorrepairfalloff.py @@ -0,0 +1,6 @@ +type = "projected", "active" +def handler(fit, container, context): + if "projected" in context: + bonus = container.getModifiedItemAttr("armorDamageAmount") + duration = container.getModifiedItemAttr("duration") / 1000.0 + fit.extraAttributes.increase("armorRepair", bonus / duration) diff --git a/eos/effects/remotehullrepairfalloff.py b/eos/effects/remotehullrepairfalloff.py new file mode 100644 index 000000000..bb15c0a11 --- /dev/null +++ b/eos/effects/remotehullrepairfalloff.py @@ -0,0 +1,12 @@ +# remoteHullRepair +# +# Used by: +# Modules from group: Remote Hull Repairer (7 of 7) +# Drones named like: Hull Maintenance Bot (6 of 6) +type = "projected", "active" +runTime = "late" +def handler(fit, module, context): + if "projected" not in context: return + bonus = module.getModifiedItemAttr("structureDamageAmount") + duration = module.getModifiedItemAttr("duration") / 1000.0 + fit.extraAttributes.increase("hullRepair", bonus / duration) diff --git a/eos/effects/remoteshieldtransferfalloff.py b/eos/effects/remoteshieldtransferfalloff.py new file mode 100644 index 000000000..317d61a26 --- /dev/null +++ b/eos/effects/remoteshieldtransferfalloff.py @@ -0,0 +1,6 @@ +type = "projected", "active" +def handler(fit, container, context): + if "projected" in context: + bonus = container.getModifiedItemAttr("shieldBonus") + duration = container.getModifiedItemAttr("duration") / 1000.0 + fit.extraAttributes.increase("shieldRepair", bonus / duration) diff --git a/eos/effects/rolebonuscdlinkspgreduction.py b/eos/effects/rolebonuscdlinkspgreduction.py new file mode 100644 index 000000000..e85f496de --- /dev/null +++ b/eos/effects/rolebonuscdlinkspgreduction.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Leadership"), "power", src.getModifiedItemAttr("roleBonusCD")) diff --git a/eos/effects/rolebonusecmcapcpu.py b/eos/effects/rolebonusecmcapcpu.py new file mode 100644 index 000000000..b357fa216 --- /dev/null +++ b/eos/effects/rolebonusecmcapcpu.py @@ -0,0 +1,4 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", "capacitorNeed", src.getModifiedItemAttr("roleBonus")) + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", "cpu", src.getModifiedItemAttr("roleBonus")) diff --git a/eos/effects/rolebonusecmrange.py b/eos/effects/rolebonusecmrange.py new file mode 100644 index 000000000..15978730d --- /dev/null +++ b/eos/effects/rolebonusecmrange.py @@ -0,0 +1,4 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", "falloff", src.getModifiedItemAttr("roleBonus")) + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", "maxRange", src.getModifiedItemAttr("roleBonus")) diff --git a/eos/effects/rolebonusjustscramblerstrength.py b/eos/effects/rolebonusjustscramblerstrength.py new file mode 100644 index 000000000..cbf2667e2 --- /dev/null +++ b/eos/effects/rolebonusjustscramblerstrength.py @@ -0,0 +1,4 @@ +type = "passive" +def handler(fit, ship, context): + fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Navigation"), + "warpScrambleStrength", ship.getModifiedItemAttr("roleBonus")) \ No newline at end of file diff --git a/eos/effects/rolebonusstasisrange.py b/eos/effects/rolebonusstasisrange.py new file mode 100644 index 000000000..b3e62a1bd --- /dev/null +++ b/eos/effects/rolebonusstasisrange.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web", "maxRange", src.getModifiedItemAttr("roleBonus")) diff --git a/eos/effects/rolebonuswdcapcpu.py b/eos/effects/rolebonuswdcapcpu.py new file mode 100644 index 000000000..946dadde4 --- /dev/null +++ b/eos/effects/rolebonuswdcapcpu.py @@ -0,0 +1,4 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "cpu", src.getModifiedItemAttr("roleBonus")) + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "capacitorNeed", src.getModifiedItemAttr("roleBonus")) diff --git a/eos/effects/rolebonuswdrange.py b/eos/effects/rolebonuswdrange.py new file mode 100644 index 000000000..91074db2d --- /dev/null +++ b/eos/effects/rolebonuswdrange.py @@ -0,0 +1,4 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "falloff", src.getModifiedItemAttr("roleBonus")) + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "maxRange", src.getModifiedItemAttr("roleBonus")) diff --git a/eos/effects/shieldtransporterfalloffbonus.py b/eos/effects/shieldtransporterfalloffbonus.py new file mode 100644 index 000000000..f133337e9 --- /dev/null +++ b/eos/effects/shieldtransporterfalloffbonus.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Shield Booster", "falloffEffectiveness", src.getModifiedItemAttr("falloffBonus")) diff --git a/eos/effects/shipbonusaoevelocityrocketsmf.py b/eos/effects/shipbonusaoevelocityrocketsmf.py new file mode 100644 index 000000000..676ddde50 --- /dev/null +++ b/eos/effects/shipbonusaoevelocityrocketsmf.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"), "aoeVelocity", src.getModifiedItemAttr("shipBonusMF"), skill="Minmatar Frigate") diff --git a/eos/effects/shipbonusdronedamagemultiplierad1.py b/eos/effects/shipbonusdronedamagemultiplierad1.py index 7e70551d7..9cd98d219 100644 --- a/eos/effects/shipbonusdronedamagemultiplierad1.py +++ b/eos/effects/shipbonusdronedamagemultiplierad1.py @@ -1,8 +1,3 @@ -# shipBonusDroneDamageMultiplierAD1 -# -# Used by: -# Ship: Dragoon type = "passive" -def handler(fit, ship, context): - fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"), - "damageMultiplier", ship.getModifiedItemAttr("shipBonusAD1"), skill="Amarr Destroyer") +def handler(fit, src, context): + fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "damageMultiplier", src.getModifiedItemAttr("shipBonusAD1"), skill="Amarr Destroyer") diff --git a/eos/effects/shipbonusdronedamagemultipliergd1.py b/eos/effects/shipbonusdronedamagemultipliergd1.py index b753cddff..e6fd67d68 100644 --- a/eos/effects/shipbonusdronedamagemultipliergd1.py +++ b/eos/effects/shipbonusdronedamagemultipliergd1.py @@ -1,8 +1,3 @@ -# shipBonusDroneDamageMultiplierGD1 -# -# Used by: -# Ship: Algos type = "passive" -def handler(fit, ship, context): - fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"), - "damageMultiplier", ship.getModifiedItemAttr("shipBonusGD1"), skill="Gallente Destroyer") +def handler(fit, src, context): + fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "damageMultiplier", src.getModifiedItemAttr("shipBonusGD1"), skill="Gallente Destroyer") diff --git a/eos/effects/shipbonusdronehitpointsad1.py b/eos/effects/shipbonusdronehitpointsad1.py index d3dd36216..72ee19bd9 100644 --- a/eos/effects/shipbonusdronehitpointsad1.py +++ b/eos/effects/shipbonusdronehitpointsad1.py @@ -1,9 +1,5 @@ -# shipBonusDroneHitpointsAD1 -# -# Used by: -# Ship: Dragoon type = "passive" -def handler(fit, ship, context): - for layer in ("shieldCapacity", "armorHP", "hp"): - fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"), - layer, ship.getModifiedItemAttr("shipBonusAD1"), skill="Amarr Destroyer") +def handler(fit, src, context): + fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "shieldCapacity", src.getModifiedItemAttr("shipBonusAD1"), skill="Amarr Destroyer") + fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "hp", src.getModifiedItemAttr("shipBonusAD1"), skill="Amarr Destroyer") + fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "armorHP", src.getModifiedItemAttr("shipBonusAD1"), skill="Amarr Destroyer") diff --git a/eos/effects/shipbonusdronehitpointsgd1.py b/eos/effects/shipbonusdronehitpointsgd1.py index 975b0ae31..bc6c685d3 100644 --- a/eos/effects/shipbonusdronehitpointsgd1.py +++ b/eos/effects/shipbonusdronehitpointsgd1.py @@ -1,9 +1,5 @@ -# shipBonusDroneHitpointsGD1 -# -# Used by: -# Ship: Algos type = "passive" -def handler(fit, ship, context): - for layer in ("shieldCapacity", "armorHP", "hp"): - fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"), - layer, ship.getModifiedItemAttr("shipBonusGD1"), skill="Gallente Destroyer") +def handler(fit, src, context): + fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "shieldCapacity", src.getModifiedItemAttr("shipBonusGD1"), skill="Gallente Destroyer") + fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "armorHP", src.getModifiedItemAttr("shipBonusGD1"), skill="Gallente Destroyer") + fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "hp", src.getModifiedItemAttr("shipBonusGD1"), skill="Gallente Destroyer") diff --git a/eos/effects/shipbonusemarmorresistancead2.py b/eos/effects/shipbonusemarmorresistancead2.py new file mode 100644 index 000000000..38047ac08 --- /dev/null +++ b/eos/effects/shipbonusemarmorresistancead2.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.ship.boostItemAttr("armorEmDamageResonance", src.getModifiedItemAttr("shipBonusAD2"), skill="Amarr Destroyer") diff --git a/eos/effects/shipbonusemarmorresistancegd2.py b/eos/effects/shipbonusemarmorresistancegd2.py new file mode 100644 index 000000000..9b8a9ac4d --- /dev/null +++ b/eos/effects/shipbonusemarmorresistancegd2.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.ship.boostItemAttr("armorEmDamageResonance", src.getModifiedItemAttr("shipBonusGD2"), skill="Gallente Destroyer") diff --git a/eos/effects/shipbonusemmissiledamagecd1.py b/eos/effects/shipbonusemmissiledamagecd1.py new file mode 100644 index 000000000..06627549e --- /dev/null +++ b/eos/effects/shipbonusemmissiledamagecd1.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "emDamage", src.getModifiedItemAttr("shipBonusCD1"), skill="Caldari Destroyer") diff --git a/eos/effects/shipbonusemmissiledmgmd1.py b/eos/effects/shipbonusemmissiledmgmd1.py new file mode 100644 index 000000000..d7b5d731d --- /dev/null +++ b/eos/effects/shipbonusemmissiledmgmd1.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "emDamage", src.getModifiedItemAttr("shipBonusMD1"), skill="Minmatar Destroyer") diff --git a/eos/effects/shipbonusemshieldresistancemd2.py b/eos/effects/shipbonusemshieldresistancemd2.py new file mode 100644 index 000000000..423fde35e --- /dev/null +++ b/eos/effects/shipbonusemshieldresistancemd2.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.ship.boostItemAttr("shieldEmDamageResonance", src.getModifiedItemAttr("shipBonusMD2"), skill="Minmatar Destroyer") diff --git a/eos/effects/shipbonusenergyneutfalloffab2.py b/eos/effects/shipbonusenergyneutfalloffab2.py new file mode 100644 index 000000000..40810e2c9 --- /dev/null +++ b/eos/effects/shipbonusenergyneutfalloffab2.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "falloffEffectiveness", src.getModifiedItemAttr("shipBonusAB2"), skill="Amarr Battleship") diff --git a/eos/effects/shipbonusenergyneutfalloffac3.py b/eos/effects/shipbonusenergyneutfalloffac3.py new file mode 100644 index 000000000..a208cf28b --- /dev/null +++ b/eos/effects/shipbonusenergyneutfalloffac3.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "falloffEffectiveness", src.getModifiedItemAttr("shipBonusAC3"), skill="Amarr Cruiser") diff --git a/eos/effects/shipbonusenergyneutfalloffad1.py b/eos/effects/shipbonusenergyneutfalloffad1.py new file mode 100644 index 000000000..c6eaf3605 --- /dev/null +++ b/eos/effects/shipbonusenergyneutfalloffad1.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "falloffEffectiveness", src.getModifiedItemAttr("shipBonusAD1"), skill="Amarr Destroyer") diff --git a/eos/effects/shipbonusenergyneutfalloffaf3.py b/eos/effects/shipbonusenergyneutfalloffaf3.py new file mode 100644 index 000000000..835aa27b3 --- /dev/null +++ b/eos/effects/shipbonusenergyneutfalloffaf3.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "falloffEffectiveness", src.getModifiedItemAttr("shipBonus3AF"), skill="Amarr Frigate") diff --git a/eos/effects/shipbonusenergyneutfalloffeaf3.py b/eos/effects/shipbonusenergyneutfalloffeaf3.py new file mode 100644 index 000000000..1f704ed70 --- /dev/null +++ b/eos/effects/shipbonusenergyneutfalloffeaf3.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "falloffEffectiveness", src.getModifiedItemAttr("eliteBonusElectronicAttackShip3"), skill="Electronic Attack Ships") diff --git a/eos/effects/shipbonusenergyneutfalloffrs2.py b/eos/effects/shipbonusenergyneutfalloffrs2.py new file mode 100644 index 000000000..017a8b667 --- /dev/null +++ b/eos/effects/shipbonusenergyneutfalloffrs2.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "falloffEffectiveness", src.getModifiedItemAttr("eliteBonusReconShip2"), skill="Recon Ships") diff --git a/eos/effects/shipbonusenergyneutfalloffrs3.py b/eos/effects/shipbonusenergyneutfalloffrs3.py new file mode 100644 index 000000000..2d242ac21 --- /dev/null +++ b/eos/effects/shipbonusenergyneutfalloffrs3.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "falloffEffectiveness", src.getModifiedItemAttr("eliteBonusReconShip3"), skill="Recon Ships") diff --git a/eos/effects/shipbonusenergyneutoptimalab.py b/eos/effects/shipbonusenergyneutoptimalab.py new file mode 100644 index 000000000..2d1e08725 --- /dev/null +++ b/eos/effects/shipbonusenergyneutoptimalab.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "maxRange", src.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship") diff --git a/eos/effects/shipbonusenergyneutoptimalac1.py b/eos/effects/shipbonusenergyneutoptimalac1.py new file mode 100644 index 000000000..580663cd9 --- /dev/null +++ b/eos/effects/shipbonusenergyneutoptimalac1.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "maxRange", src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser") diff --git a/eos/effects/shipbonusenergyneutoptimalad2.py b/eos/effects/shipbonusenergyneutoptimalad2.py new file mode 100644 index 000000000..d2c4a4e37 --- /dev/null +++ b/eos/effects/shipbonusenergyneutoptimalad2.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "maxRange", src.getModifiedItemAttr("shipBonusAD2"), skill="Amarr Destroyer") diff --git a/eos/effects/shipbonusenergyneutoptimalaf2.py b/eos/effects/shipbonusenergyneutoptimalaf2.py new file mode 100644 index 000000000..16cff81fa --- /dev/null +++ b/eos/effects/shipbonusenergyneutoptimalaf2.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "maxRange", src.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate") diff --git a/eos/effects/shipbonusenergyneutoptimaleaf1.py b/eos/effects/shipbonusenergyneutoptimaleaf1.py new file mode 100644 index 000000000..4dc4c6b96 --- /dev/null +++ b/eos/effects/shipbonusenergyneutoptimaleaf1.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "maxRange", src.getModifiedItemAttr("eliteBonusElectronicAttackShip1"), skill="Electronic Attack Ships") diff --git a/eos/effects/shipbonusenergyneutoptimalrs1.py b/eos/effects/shipbonusenergyneutoptimalrs1.py new file mode 100644 index 000000000..6dfeacb3d --- /dev/null +++ b/eos/effects/shipbonusenergyneutoptimalrs1.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "maxRange", src.getModifiedItemAttr("eliteBonusReconShip1"), skill="Recon Ships") diff --git a/eos/effects/shipbonusenergyneutoptimalrs3.py b/eos/effects/shipbonusenergyneutoptimalrs3.py new file mode 100644 index 000000000..3e3fa70fb --- /dev/null +++ b/eos/effects/shipbonusenergyneutoptimalrs3.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "maxRange", src.getModifiedItemAttr("eliteBonusReconShip3"), skill="Recon Ships") diff --git a/eos/effects/shipbonusenergyneutrangeab2.py b/eos/effects/shipbonusenergyneutrangeab2.py index dee87f0fb..b0602ef11 100644 --- a/eos/effects/shipbonusenergyneutrangeab2.py +++ b/eos/effects/shipbonusenergyneutrangeab2.py @@ -4,5 +4,5 @@ # Ship: Armageddon type = "passive" def handler(fit, ship, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Destabilizer", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "energyDestabilizationRange", ship.getModifiedItemAttr("shipBonusAB2"), skill="Amarr Battleship") diff --git a/eos/effects/shipbonusenergyneutrangead2.py b/eos/effects/shipbonusenergyneutrangead2.py index d5531edd7..3357d9ed7 100644 --- a/eos/effects/shipbonusenergyneutrangead2.py +++ b/eos/effects/shipbonusenergyneutrangead2.py @@ -4,5 +4,5 @@ # Ship: Dragoon type = "passive" def handler(fit, ship, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Destabilizer", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "energyDestabilizationRange", ship.getModifiedItemAttr("shipBonusAD2"), skill="Amarr Destroyer") diff --git a/eos/effects/shipbonusenergynosfalloffab.py b/eos/effects/shipbonusenergynosfalloffab.py new file mode 100644 index 000000000..e6451ce3d --- /dev/null +++ b/eos/effects/shipbonusenergynosfalloffab.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "falloffEffectiveness", src.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship") diff --git a/eos/effects/shipbonusenergynosfalloffab2.py b/eos/effects/shipbonusenergynosfalloffab2.py new file mode 100644 index 000000000..07f933f17 --- /dev/null +++ b/eos/effects/shipbonusenergynosfalloffab2.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "falloffEffectiveness", src.getModifiedItemAttr("shipBonusAB2"), skill="Amarr Battleship") diff --git a/eos/effects/shipbonusenergynosfalloffac3.py b/eos/effects/shipbonusenergynosfalloffac3.py new file mode 100644 index 000000000..ba25c6950 --- /dev/null +++ b/eos/effects/shipbonusenergynosfalloffac3.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "falloffEffectiveness", src.getModifiedItemAttr("shipBonusAC3"), skill="Amarr Cruiser") diff --git a/eos/effects/shipbonusenergynosfalloffad1.py b/eos/effects/shipbonusenergynosfalloffad1.py new file mode 100644 index 000000000..61cc33227 --- /dev/null +++ b/eos/effects/shipbonusenergynosfalloffad1.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "falloffEffectiveness", src.getModifiedItemAttr("shipBonusAD1"), skill="Amarr Destroyer") diff --git a/eos/effects/shipbonusenergynosfalloffaf3.py b/eos/effects/shipbonusenergynosfalloffaf3.py new file mode 100644 index 000000000..486ac7b72 --- /dev/null +++ b/eos/effects/shipbonusenergynosfalloffaf3.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "falloffEffectiveness", src.getModifiedItemAttr("shipBonus3AF"), skill="Amarr Frigate") diff --git a/eos/effects/shipbonusenergynosfalloffeaf3.py b/eos/effects/shipbonusenergynosfalloffeaf3.py new file mode 100644 index 000000000..c7816bb0f --- /dev/null +++ b/eos/effects/shipbonusenergynosfalloffeaf3.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "falloffEffectiveness", src.getModifiedItemAttr("eliteBonusElectronicAttackShip3"), skill="Electronic Attack Ships") diff --git a/eos/effects/shipbonusenergynosfalloffrs2.py b/eos/effects/shipbonusenergynosfalloffrs2.py new file mode 100644 index 000000000..274a91ada --- /dev/null +++ b/eos/effects/shipbonusenergynosfalloffrs2.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "falloffEffectiveness", src.getModifiedItemAttr("eliteBonusReconShip2"), skill="Recon Ships") diff --git a/eos/effects/shipbonusenergynosfalloffrs3.py b/eos/effects/shipbonusenergynosfalloffrs3.py new file mode 100644 index 000000000..4feecd7ac --- /dev/null +++ b/eos/effects/shipbonusenergynosfalloffrs3.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "falloffEffectiveness", src.getModifiedItemAttr("eliteBonusReconShip3"), skill="Recon Ships") diff --git a/eos/effects/shipbonusenergynosoptimalac1.py b/eos/effects/shipbonusenergynosoptimalac1.py new file mode 100644 index 000000000..ecb8b7222 --- /dev/null +++ b/eos/effects/shipbonusenergynosoptimalac1.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "maxRange", src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser") diff --git a/eos/effects/shipbonusenergynosoptimalad2.py b/eos/effects/shipbonusenergynosoptimalad2.py new file mode 100644 index 000000000..7112f90fa --- /dev/null +++ b/eos/effects/shipbonusenergynosoptimalad2.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "maxRange", src.getModifiedItemAttr("shipBonusAD2"), skill="Amarr Destroyer") diff --git a/eos/effects/shipbonusenergynosoptimalaf2.py b/eos/effects/shipbonusenergynosoptimalaf2.py new file mode 100644 index 000000000..113bb33dc --- /dev/null +++ b/eos/effects/shipbonusenergynosoptimalaf2.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "maxRange", src.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate") diff --git a/eos/effects/shipbonusenergynosoptimaleaf1.py b/eos/effects/shipbonusenergynosoptimaleaf1.py new file mode 100644 index 000000000..8efe12a2f --- /dev/null +++ b/eos/effects/shipbonusenergynosoptimaleaf1.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "maxRange", src.getModifiedItemAttr("eliteBonusElectronicAttackShip1"), skill="Electronic Attack Ships") diff --git a/eos/effects/shipbonusenergynosoptimalrs1.py b/eos/effects/shipbonusenergynosoptimalrs1.py new file mode 100644 index 000000000..7a7cb4bd6 --- /dev/null +++ b/eos/effects/shipbonusenergynosoptimalrs1.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "maxRange", src.getModifiedItemAttr("eliteBonusReconShip1"), skill="Recon Ships") diff --git a/eos/effects/shipbonusenergynosoptimalrs3.py b/eos/effects/shipbonusenergynosoptimalrs3.py new file mode 100644 index 000000000..6d24848fe --- /dev/null +++ b/eos/effects/shipbonusenergynosoptimalrs3.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "maxRange", src.getModifiedItemAttr("eliteBonusReconShip3"), skill="Recon Ships") diff --git a/eos/effects/shipbonusenergyvampirerangeab2.py b/eos/effects/shipbonusenergyvampirerangeab2.py index 2dded0794..66e1ae926 100644 --- a/eos/effects/shipbonusenergyvampirerangeab2.py +++ b/eos/effects/shipbonusenergyvampirerangeab2.py @@ -4,5 +4,5 @@ # Ship: Armageddon type = "passive" def handler(fit, ship, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Vampire", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "powerTransferRange", ship.getModifiedItemAttr("shipBonusAB2"), skill="Amarr Battleship") diff --git a/eos/effects/shipbonusenergyvampirerangead2.py b/eos/effects/shipbonusenergyvampirerangead2.py index d3fe34378..a71170696 100644 --- a/eos/effects/shipbonusenergyvampirerangead2.py +++ b/eos/effects/shipbonusenergyvampirerangead2.py @@ -4,5 +4,5 @@ # Ship: Dragoon type = "passive" def handler(fit, ship, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Vampire", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "powerTransferRange", ship.getModifiedItemAttr("shipBonusAD2"), skill="Amarr Destroyer") diff --git a/eos/effects/shipbonusewweapondisruptionstrengthac1.py b/eos/effects/shipbonusewweapondisruptionstrengthac1.py new file mode 100644 index 000000000..5a947e8e4 --- /dev/null +++ b/eos/effects/shipbonusewweapondisruptionstrengthac1.py @@ -0,0 +1,9 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "missileVelocityBonus", src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "aoeVelocityBonus", src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "maxRangeBonus", src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "explosionDelayBonus", src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "aoeCloudSizeBonus", src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "trackingSpeedBonus", src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "falloffBonus", src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser") diff --git a/eos/effects/shipbonusewweapondisruptionstrengthaf2.py b/eos/effects/shipbonusewweapondisruptionstrengthaf2.py new file mode 100644 index 000000000..2cf85e987 --- /dev/null +++ b/eos/effects/shipbonusewweapondisruptionstrengthaf2.py @@ -0,0 +1,9 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "trackingSpeedBonus", src.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "explosionDelayBonus", src.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "maxRangeBonus", src.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "falloffBonus", src.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "missileVelocityBonus", src.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "aoeVelocityBonus", src.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "aoeCloudSizeBonus", src.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate") diff --git a/eos/effects/shipbonusewweapondisruptiontrackingspeedbonusac1.py b/eos/effects/shipbonusewweapondisruptiontrackingspeedbonusac1.py index 4b7638db9..768f7cd62 100644 --- a/eos/effects/shipbonusewweapondisruptiontrackingspeedbonusac1.py +++ b/eos/effects/shipbonusewweapondisruptiontrackingspeedbonusac1.py @@ -4,5 +4,5 @@ # Variations of ship: Arbitrator (3 of 3) type = "passive" def handler(fit, ship, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tracking Disruptor", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Weapon Disruptor", "trackingSpeedBonus", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser") diff --git a/eos/effects/shipbonusewweapondisruptiontrackingspeedbonusrookie.py b/eos/effects/shipbonusewweapondisruptiontrackingspeedbonusrookie.py index d80b53451..b5ce0be09 100644 --- a/eos/effects/shipbonusewweapondisruptiontrackingspeedbonusrookie.py +++ b/eos/effects/shipbonusewweapondisruptiontrackingspeedbonusrookie.py @@ -4,5 +4,5 @@ # Ship: Impairor type = "passive" def handler(fit, ship, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tracking Disruptor", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Weapon Disruptor", "trackingSpeedBonus", ship.getModifiedItemAttr("rookieWeaponDisruptionBonus")) diff --git a/eos/effects/shipbonusexplosivearmorresistancead2.py b/eos/effects/shipbonusexplosivearmorresistancead2.py new file mode 100644 index 000000000..8190af8e0 --- /dev/null +++ b/eos/effects/shipbonusexplosivearmorresistancead2.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.ship.boostItemAttr("armorExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusAD2"), skill="Amarr Destroyer") diff --git a/eos/effects/shipbonusexplosivearmorresistancegd2.py b/eos/effects/shipbonusexplosivearmorresistancegd2.py new file mode 100644 index 000000000..b2427a891 --- /dev/null +++ b/eos/effects/shipbonusexplosivearmorresistancegd2.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.ship.boostItemAttr("armorExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusGD2"), skill="Gallente Destroyer") diff --git a/eos/effects/shipbonusexplosivemissiledamagecd1.py b/eos/effects/shipbonusexplosivemissiledamagecd1.py new file mode 100644 index 000000000..afd5cfa98 --- /dev/null +++ b/eos/effects/shipbonusexplosivemissiledamagecd1.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "explosiveDamage", src.getModifiedItemAttr("shipBonusCD1"), skill="Caldari Destroyer") diff --git a/eos/effects/shipbonusexplosivemissiledmgmd1.py b/eos/effects/shipbonusexplosivemissiledmgmd1.py new file mode 100644 index 000000000..fe780b008 --- /dev/null +++ b/eos/effects/shipbonusexplosivemissiledmgmd1.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "explosiveDamage", src.getModifiedItemAttr("shipBonusMD1"), skill="Minmatar Destroyer") diff --git a/eos/effects/shipbonusexplosiveshieldresistancemd2.py b/eos/effects/shipbonusexplosiveshieldresistancemd2.py new file mode 100644 index 000000000..09aa7d92a --- /dev/null +++ b/eos/effects/shipbonusexplosiveshieldresistancemd2.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.ship.boostItemAttr("shieldExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusMD2"), skill="Minmatar Destroyer") diff --git a/eos/effects/shipbonusjustscramblerrangegf2.py b/eos/effects/shipbonusjustscramblerrangegf2.py new file mode 100644 index 000000000..6f84fe9d8 --- /dev/null +++ b/eos/effects/shipbonusjustscramblerrangegf2.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Navigation"), "maxRange", src.getModifiedItemAttr("shipBonusGF2"), skill="Gallente Frigate") diff --git a/eos/effects/shipbonuskineticarmorresistancead2.py b/eos/effects/shipbonuskineticarmorresistancead2.py new file mode 100644 index 000000000..8c4ddad63 --- /dev/null +++ b/eos/effects/shipbonuskineticarmorresistancead2.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.ship.boostItemAttr("armorKineticDamageResonance", src.getModifiedItemAttr("shipBonusAD2"), skill="Amarr Destroyer") diff --git a/eos/effects/shipbonuskineticarmorresistancegd2.py b/eos/effects/shipbonuskineticarmorresistancegd2.py new file mode 100644 index 000000000..d5f3637af --- /dev/null +++ b/eos/effects/shipbonuskineticarmorresistancegd2.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.ship.boostItemAttr("armorKineticDamageResonance", src.getModifiedItemAttr("shipBonusGD2"), skill="Gallente Destroyer") diff --git a/eos/effects/shipbonuskineticmissiledamagecd1.py b/eos/effects/shipbonuskineticmissiledamagecd1.py new file mode 100644 index 000000000..d752e500b --- /dev/null +++ b/eos/effects/shipbonuskineticmissiledamagecd1.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "kineticDamage", src.getModifiedItemAttr("shipBonusCD1"), skill="Caldari Destroyer") diff --git a/eos/effects/shipbonuskineticmissiledmgmd1.py b/eos/effects/shipbonuskineticmissiledmgmd1.py new file mode 100644 index 000000000..9a3c444a0 --- /dev/null +++ b/eos/effects/shipbonuskineticmissiledmgmd1.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "kineticDamage", src.getModifiedItemAttr("shipBonusMD1"), skill="Minmatar Destroyer") diff --git a/eos/effects/shipbonuskineticshieldresistancemd2.py b/eos/effects/shipbonuskineticshieldresistancemd2.py new file mode 100644 index 000000000..0b5ffa4c0 --- /dev/null +++ b/eos/effects/shipbonuskineticshieldresistancemd2.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.ship.boostItemAttr("shieldKineticDamageResonance", src.getModifiedItemAttr("shipBonusMD2"), skill="Minmatar Destroyer") diff --git a/eos/effects/shipbonusshieldemresistancecd2.py b/eos/effects/shipbonusshieldemresistancecd2.py new file mode 100644 index 000000000..4cf9c3341 --- /dev/null +++ b/eos/effects/shipbonusshieldemresistancecd2.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.ship.boostItemAttr("shieldEmDamageResonance", src.getModifiedItemAttr("shipBonusCD2"), skill="Caldari Destroyer") diff --git a/eos/effects/shipbonusshieldexplosiveresistancecd2.py b/eos/effects/shipbonusshieldexplosiveresistancecd2.py new file mode 100644 index 000000000..f64499eaf --- /dev/null +++ b/eos/effects/shipbonusshieldexplosiveresistancecd2.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.ship.boostItemAttr("shieldExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusCD2"), skill="Caldari Destroyer") diff --git a/eos/effects/shipbonusshieldkineticresistancecd2.py b/eos/effects/shipbonusshieldkineticresistancecd2.py new file mode 100644 index 000000000..f2d7551a6 --- /dev/null +++ b/eos/effects/shipbonusshieldkineticresistancecd2.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.ship.boostItemAttr("shieldKineticDamageResonance", src.getModifiedItemAttr("shipBonusCD2"), skill="Caldari Destroyer") diff --git a/eos/effects/shipbonusshieldthermalresistancecd2.py b/eos/effects/shipbonusshieldthermalresistancecd2.py new file mode 100644 index 000000000..f4ffeda64 --- /dev/null +++ b/eos/effects/shipbonusshieldthermalresistancecd2.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.ship.boostItemAttr("shieldThermalDamageResonance", src.getModifiedItemAttr("shipBonusCD2"), skill="Caldari Destroyer") diff --git a/eos/effects/shipbonusthermalarmorresistancead2.py b/eos/effects/shipbonusthermalarmorresistancead2.py new file mode 100644 index 000000000..dcadae1c1 --- /dev/null +++ b/eos/effects/shipbonusthermalarmorresistancead2.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.ship.boostItemAttr("armorThermalDamageResonance", src.getModifiedItemAttr("shipBonusAD2"), skill="Amarr Destroyer") diff --git a/eos/effects/shipbonusthermalarmorresistancegd2.py b/eos/effects/shipbonusthermalarmorresistancegd2.py new file mode 100644 index 000000000..8550ba23a --- /dev/null +++ b/eos/effects/shipbonusthermalarmorresistancegd2.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.ship.boostItemAttr("armorThermalDamageResonance", src.getModifiedItemAttr("shipBonusGD2"), skill="Gallente Destroyer") diff --git a/eos/effects/shipbonusthermalmissiledamagecd1.py b/eos/effects/shipbonusthermalmissiledamagecd1.py new file mode 100644 index 000000000..63fdd9337 --- /dev/null +++ b/eos/effects/shipbonusthermalmissiledamagecd1.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "thermalDamage", src.getModifiedItemAttr("shipBonusCD1"), skill="Caldari Destroyer") diff --git a/eos/effects/shipbonusthermalshieldresistancemd2.py b/eos/effects/shipbonusthermalshieldresistancemd2.py new file mode 100644 index 000000000..ecb351191 --- /dev/null +++ b/eos/effects/shipbonusthermalshieldresistancemd2.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.ship.boostItemAttr("shieldThermalDamageResonance", src.getModifiedItemAttr("shipBonusMD2"), skill="Minmatar Destroyer") diff --git a/eos/effects/shipbonusthermmissiledmgmd1.py b/eos/effects/shipbonusthermmissiledmgmd1.py new file mode 100644 index 000000000..d7e386683 --- /dev/null +++ b/eos/effects/shipbonusthermmissiledmgmd1.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "thermalDamage", src.getModifiedItemAttr("shipBonusMD1"), skill="Minmatar Destroyer") diff --git a/eos/effects/shipenergydrainamountaf1.py b/eos/effects/shipenergydrainamountaf1.py index 67f97345c..21239c039 100644 --- a/eos/effects/shipenergydrainamountaf1.py +++ b/eos/effects/shipenergydrainamountaf1.py @@ -5,5 +5,5 @@ # Ship: Sentinel type = "passive" def handler(fit, ship, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Vampire", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "powerTransferAmount", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate") diff --git a/eos/effects/shipenergyneutralizerrangebonusac.py b/eos/effects/shipenergyneutralizerrangebonusac.py index 2d5b8767f..f4109c4e2 100644 --- a/eos/effects/shipenergyneutralizerrangebonusac.py +++ b/eos/effects/shipenergyneutralizerrangebonusac.py @@ -4,5 +4,5 @@ # Ship: Vangel type = "passive" def handler(fit, ship, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Destabilizer", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "energyDestabilizationRange", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser") diff --git a/eos/effects/shipenergyneutralizerrangebonusaf2.py b/eos/effects/shipenergyneutralizerrangebonusaf2.py index fb5e5a88b..d574dbb13 100644 --- a/eos/effects/shipenergyneutralizerrangebonusaf2.py +++ b/eos/effects/shipenergyneutralizerrangebonusaf2.py @@ -4,5 +4,5 @@ # Ship: Malice type = "passive" def handler(fit, ship, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Destabilizer", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "energyDestabilizationRange", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate") diff --git a/eos/effects/shipenergyneutralizertransferamountbonusab.py b/eos/effects/shipenergyneutralizertransferamountbonusab.py index b3b69c078..3a005e1fc 100644 --- a/eos/effects/shipenergyneutralizertransferamountbonusab.py +++ b/eos/effects/shipenergyneutralizertransferamountbonusab.py @@ -4,5 +4,5 @@ # Ship: Bhaalgorn type = "passive" def handler(fit, ship, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Destabilizer", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "energyDestabilizationAmount", ship.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship") diff --git a/eos/effects/shipenergyneutralizertransferamountbonusac.py b/eos/effects/shipenergyneutralizertransferamountbonusac.py index 436ef71e7..1c4546fd3 100644 --- a/eos/effects/shipenergyneutralizertransferamountbonusac.py +++ b/eos/effects/shipenergyneutralizertransferamountbonusac.py @@ -5,5 +5,5 @@ # Ship: Vangel type = "passive" def handler(fit, ship, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Destabilizer", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "energyDestabilizationAmount", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser") diff --git a/eos/effects/shipenergyneutralizertransferamountbonusaf.py b/eos/effects/shipenergyneutralizertransferamountbonusaf.py index 88e0f7bd3..6e525dcb1 100644 --- a/eos/effects/shipenergyneutralizertransferamountbonusaf.py +++ b/eos/effects/shipenergyneutralizertransferamountbonusaf.py @@ -5,5 +5,5 @@ # Ship: Sentinel type = "passive" def handler(fit, ship, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Destabilizer", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "energyDestabilizationAmount", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate") diff --git a/eos/effects/shipenergyneutralizertransferamountbonusaf2.py b/eos/effects/shipenergyneutralizertransferamountbonusaf2.py index ee16f8188..36a9f2b95 100644 --- a/eos/effects/shipenergyneutralizertransferamountbonusaf2.py +++ b/eos/effects/shipenergyneutralizertransferamountbonusaf2.py @@ -4,5 +4,5 @@ # Ship: Malice type = "passive" def handler(fit, ship, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Destabilizer", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "energyDestabilizationAmount", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate") diff --git a/eos/effects/shipenergyvampireamountbonusfixedaf2.py b/eos/effects/shipenergyvampireamountbonusfixedaf2.py index 0e76b07c9..09ca0424d 100644 --- a/eos/effects/shipenergyvampireamountbonusfixedaf2.py +++ b/eos/effects/shipenergyvampireamountbonusfixedaf2.py @@ -4,5 +4,5 @@ # Ship: Malice type = "passive" def handler(fit, ship, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Vampire", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "powerTransferAmount", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate") diff --git a/eos/effects/shipenergyvampirerangebonusfixedac.py b/eos/effects/shipenergyvampirerangebonusfixedac.py index b2cf784b8..b18bc906b 100644 --- a/eos/effects/shipenergyvampirerangebonusfixedac.py +++ b/eos/effects/shipenergyvampirerangebonusfixedac.py @@ -4,5 +4,5 @@ # Ship: Vangel type = "passive" def handler(fit, ship, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Vampire", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "powerTransferRange", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser") diff --git a/eos/effects/shipenergyvampirerangebonusfixedaf2.py b/eos/effects/shipenergyvampirerangebonusfixedaf2.py index 5a794654f..8a84b1b14 100644 --- a/eos/effects/shipenergyvampirerangebonusfixedaf2.py +++ b/eos/effects/shipenergyvampirerangebonusfixedaf2.py @@ -4,5 +4,5 @@ # Ship: Malice type = "passive" def handler(fit, ship, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Vampire", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "powerTransferRange", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate") diff --git a/eos/effects/shipenergyvampiretransferamountbonusab.py b/eos/effects/shipenergyvampiretransferamountbonusab.py index dbeb39356..012d52331 100644 --- a/eos/effects/shipenergyvampiretransferamountbonusab.py +++ b/eos/effects/shipenergyvampiretransferamountbonusab.py @@ -4,5 +4,5 @@ # Ship: Bhaalgorn type = "passive" def handler(fit, ship, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Vampire", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "powerTransferAmount", ship.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship") diff --git a/eos/effects/shipenergyvampiretransferamountbonusac.py b/eos/effects/shipenergyvampiretransferamountbonusac.py index f8932bc65..e7bb68862 100644 --- a/eos/effects/shipenergyvampiretransferamountbonusac.py +++ b/eos/effects/shipenergyvampiretransferamountbonusac.py @@ -5,5 +5,5 @@ # Ship: Vangel type = "passive" def handler(fit, ship, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Vampire", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "powerTransferAmount", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser") diff --git a/eos/effects/shipetdamageaf.py b/eos/effects/shipetdamageaf.py index 74dded640..013a92685 100644 --- a/eos/effects/shipetdamageaf.py +++ b/eos/effects/shipetdamageaf.py @@ -1,9 +1,3 @@ -# shipETDamageAF -# -# Used by: -# Ship: Crusader -# Ship: Imperial Navy Slicer type = "passive" -def handler(fit, ship, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"), - "damageMultiplier", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate") \ No newline at end of file +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"), "damageMultiplier", src.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate") diff --git a/eos/effects/shipmissilekindamagecc3.py b/eos/effects/shipmissilekindamagecc3.py new file mode 100644 index 000000000..ec03affec --- /dev/null +++ b/eos/effects/shipmissilekindamagecc3.py @@ -0,0 +1,14 @@ +# shipMissileKinDamageCC3 +# Modifier 1: +# # state: offline +# # scope: local +# # srcattr: shipBonusCC3 1535 +# # operator: post_percent 8 +# # tgtattr: kineticDamage (not penalized) 117 +# # location: space +# # filter type: skill +# # filter value: Missile Launcher Operation + +type = "passive" +def handler(fit, src, context): + fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "kineticDamage", src.getModifiedItemAttr("shipBonusCC3"), skill="Caldari Cruiser") \ No newline at end of file diff --git a/eos/effects/shipneutdestabilizationamountbonusrookie.py b/eos/effects/shipneutdestabilizationamountbonusrookie.py index 09ec51339..d333686cc 100644 --- a/eos/effects/shipneutdestabilizationamountbonusrookie.py +++ b/eos/effects/shipneutdestabilizationamountbonusrookie.py @@ -4,5 +4,5 @@ # Ship: Hematos type = "passive" def handler(fit, ship, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Destabilizer", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "energyDestabilizationAmount", ship.getModifiedItemAttr("rookieNeutDrain")) diff --git a/eos/effects/shipnostransferamountbonusrookie.py b/eos/effects/shipnostransferamountbonusrookie.py index be9240bb3..810539815 100644 --- a/eos/effects/shipnostransferamountbonusrookie.py +++ b/eos/effects/shipnostransferamountbonusrookie.py @@ -4,5 +4,5 @@ # Ship: Hematos type = "passive" def handler(fit, ship, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Vampire", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "powerTransferAmount", ship.getModifiedItemAttr("rookieNosDrain")) diff --git a/eos/effects/shipremotearmorfalloffac2.py b/eos/effects/shipremotearmorfalloffac2.py new file mode 100644 index 000000000..7cdc7392f --- /dev/null +++ b/eos/effects/shipremotearmorfalloffac2.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "falloffEffectiveness", src.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser") diff --git a/eos/effects/shipremotearmorfalloffgc1.py b/eos/effects/shipremotearmorfalloffgc1.py new file mode 100644 index 000000000..031fc202e --- /dev/null +++ b/eos/effects/shipremotearmorfalloffgc1.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "falloffEffectiveness", src.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser") diff --git a/eos/effects/shipremotearmorrangeac2.py b/eos/effects/shipremotearmorrangeac2.py new file mode 100644 index 000000000..64ca620f6 --- /dev/null +++ b/eos/effects/shipremotearmorrangeac2.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "maxRange", src.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser") diff --git a/eos/effects/shipremotearmorrangegc1.py b/eos/effects/shipremotearmorrangegc1.py new file mode 100644 index 000000000..7cf0a6cf9 --- /dev/null +++ b/eos/effects/shipremotearmorrangegc1.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "maxRange", src.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser") diff --git a/eos/effects/shiprocketemthermkindmgmf2.py b/eos/effects/shiprocketemthermkindmgmf2.py new file mode 100644 index 000000000..8d3e25cbd --- /dev/null +++ b/eos/effects/shiprocketemthermkindmgmf2.py @@ -0,0 +1,5 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"), "emDamage", src.getModifiedItemAttr("shipBonusMF2"), skill="Minmatar Frigate") + fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"), "thermalDamage", src.getModifiedItemAttr("shipBonusMF2"), skill="Minmatar Frigate") + fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"), "kineticDamage", src.getModifiedItemAttr("shipBonusMF2"), skill="Minmatar Frigate") diff --git a/eos/effects/shiprocketexpdmgmf3.py b/eos/effects/shiprocketexpdmgmf3.py new file mode 100644 index 000000000..f94d45fbc --- /dev/null +++ b/eos/effects/shiprocketexpdmgmf3.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"), "explosiveDamage", src.getModifiedItemAttr("shipBonus3MF"), skill="Minmatar Frigate") diff --git a/eos/effects/shipshieldtransferfalloffcc1.py b/eos/effects/shipshieldtransferfalloffcc1.py new file mode 100644 index 000000000..8f2d5aa02 --- /dev/null +++ b/eos/effects/shipshieldtransferfalloffcc1.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "falloffEffectiveness", src.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser") diff --git a/eos/effects/shipshieldtransferfalloffmc2.py b/eos/effects/shipshieldtransferfalloffmc2.py new file mode 100644 index 000000000..7e9695af7 --- /dev/null +++ b/eos/effects/shipshieldtransferfalloffmc2.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "falloffEffectiveness", src.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser") diff --git a/eos/effects/shipshieldtransferrangecc1.py b/eos/effects/shipshieldtransferrangecc1.py new file mode 100644 index 000000000..d62db2ff0 --- /dev/null +++ b/eos/effects/shipshieldtransferrangecc1.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "maxRange", src.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser") diff --git a/eos/effects/shipshieldtransferrangemc2.py b/eos/effects/shipshieldtransferrangemc2.py new file mode 100644 index 000000000..2eedca3db --- /dev/null +++ b/eos/effects/shipshieldtransferrangemc2.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "maxRange", src.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser") diff --git a/eos/effects/shipsmallmissilekindmgcf3.py b/eos/effects/shipsmallmissilekindmgcf3.py new file mode 100644 index 000000000..c6128917f --- /dev/null +++ b/eos/effects/shipsmallmissilekindmgcf3.py @@ -0,0 +1,23 @@ +# shipSmallMissileKinDmgCF3 +# Modifier 1: +# # state: offline +# # scope: local +# # srcattr: shipBonus3CF 1624 +# # operator: post_percent 8 +# # tgtattr: kineticDamage (not penalized) 117 +# # location: space +# # filter type: skill +# # filter value: Light Missiles +# Modifier 2: +# # state: offline +# # scope: local +# # srcattr: shipBonus3CF 1624 +# # operator: post_percent 8 +# # tgtattr: kineticDamage (not penalized) 117 +# # location: space +# # filter type: skill +# # filter value: Rockets + +type = "passive" +def handler(fit, src, context): + fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles") or mod.charge.requiresSkill("Rockets"), "kineticDamage", src.getModifiedItemAttr("shipBonus3CF"), skill="Caldari Frigate") \ No newline at end of file diff --git a/eos/effects/subsystembonusamarrelectronicenergydestabilizeramount.py b/eos/effects/subsystembonusamarrelectronicenergydestabilizeramount.py index 9cb8a1ace..55e7d5614 100644 --- a/eos/effects/subsystembonusamarrelectronicenergydestabilizeramount.py +++ b/eos/effects/subsystembonusamarrelectronicenergydestabilizeramount.py @@ -4,5 +4,5 @@ # Subsystem: Legion Electronics - Energy Parasitic Complex type = "passive" def handler(fit, module, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Destabilizer", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "energyDestabilizationAmount", module.getModifiedItemAttr("subsystemBonusAmarrElectronic"), skill="Amarr Electronic Systems") diff --git a/eos/effects/subsystembonusamarrelectronicenergyvampireamount.py b/eos/effects/subsystembonusamarrelectronicenergyvampireamount.py index 2eb6990b4..080d3dc92 100644 --- a/eos/effects/subsystembonusamarrelectronicenergyvampireamount.py +++ b/eos/effects/subsystembonusamarrelectronicenergyvampireamount.py @@ -4,5 +4,5 @@ # Subsystem: Legion Electronics - Energy Parasitic Complex type = "passive" def handler(fit, module, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Vampire", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "powerTransferAmount", module.getModifiedItemAttr("subsystemBonusAmarrElectronic"), skill="Amarr Electronic Systems") diff --git a/eos/effects/systemenergyneutmultiplier.py b/eos/effects/systemenergyneutmultiplier.py index bafb24f06..8c6328c98 100644 --- a/eos/effects/systemenergyneutmultiplier.py +++ b/eos/effects/systemenergyneutmultiplier.py @@ -5,6 +5,6 @@ runTime = "early" type = ("projected", "passive") def handler(fit, beacon, context): - fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Energy Destabilizer", + fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Energy Neutralizer", "energyDestabilizationAmount", beacon.getModifiedItemAttr("energyWarfareStrengthMultiplier"), stackingPenalties=True, penaltyGroup="postMul") diff --git a/eos/effects/systemenergyvampiremultiplier.py b/eos/effects/systemenergyvampiremultiplier.py index 1d6c71d01..15a634762 100644 --- a/eos/effects/systemenergyvampiremultiplier.py +++ b/eos/effects/systemenergyvampiremultiplier.py @@ -5,6 +5,6 @@ runTime = "early" type = ("projected", "passive") def handler(fit, beacon, context): - fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Energy Vampire", + fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Energy Nosferatu", "powerTransferAmount", beacon.getModifiedItemAttr("energyWarfareStrengthMultiplier"), stackingPenalties=True, penaltyGroup="postMul") diff --git a/eos/effects/targetmissiledisruptorhostile.py b/eos/effects/targetmissiledisruptorhostile.py new file mode 100644 index 000000000..489c4d99b --- /dev/null +++ b/eos/effects/targetmissiledisruptorhostile.py @@ -0,0 +1,51 @@ +# targetMissileDisruptorHostile +# Modifier 1: +# # state: active +# # scope: projected +# # srcattr: explosionDelayBonus 596 +# # operator: post_percent 8 +# # tgtattr: explosionDelay (penalized) 281 +# # location: ship +# # filter type: skill +# # filter value: Missile Launcher Operation +# Modifier 2: +# # state: active +# # scope: projected +# # srcattr: aoeVelocityBonus 847 +# # operator: post_percent 8 +# # tgtattr: aoeVelocity (penalized) 653 +# # location: ship +# # filter type: skill +# # filter value: Missile Launcher Operation +# Modifier 3: +# # state: active +# # scope: projected +# # srcattr: aoeCloudSizeBonus 848 +# # operator: post_percent 8 +# # tgtattr: aoeCloudSize (penalized) 654 +# # location: ship +# # filter type: skill +# # filter value: Missile Launcher Operation +# Modifier 4: +# # state: active +# # scope: projected +# # srcattr: missileVelocityBonus 547 +# # operator: post_percent 8 +# # tgtattr: maxVelocity (penalized) 37 +# # location: ship +# # filter type: skill +# # filter value: Missile Launcher Operation +# +type = "active", "projected" + +def handler(fit, src, context): + if "projected" in context: + for srcAttr, tgtAttr in ( + ("aoeCloudSizeBonus", "aoeCloudSize"), + ("aoeVelocityBonus", "aoeVelocity"), + ("missileVelocityBonus", "maxVelocity"), + ("explosionDelayBonus", "explosionDelay"), + ): + fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), + tgtAttr, src.getModifiedItemAttr(srcAttr), + stackingPenalties=True) diff --git a/eos/saveddata/drone.py b/eos/saveddata/drone.py index 2fcb6a908..507c55681 100644 --- a/eos/saveddata/drone.py +++ b/eos/saveddata/drone.py @@ -172,7 +172,7 @@ class Drone(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut): # Put them in the attrs tuple. @property def falloff(self): - attrs = ("falloff",) + attrs = ("falloff", "falloffEffectiveness") for attr in attrs: falloff = self.getModifiedItemAttr(attr) if falloff is not None: return falloff @@ -201,7 +201,7 @@ class Drone(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut): # Do not allow to apply offensive modules on ship with offensive module immunite, with few exceptions # (all effects which apply instant modification are exception, generally speaking) if item.offensive and projectedOnto.ship.getModifiedItemAttr("disallowOffensiveModifiers") == 1: - offensiveNonModifiers = set(("energyDestabilizationNew", "leech")) + offensiveNonModifiers = set(("energyDestabilizationNew", "leech", "energyNosferatuFalloff", "energyNeutralizerFalloff")) if not offensiveNonModifiers.intersection(set(item.effects)): return False # If assistive modules are not allowed, do not let to apply these altogether diff --git a/eos/saveddata/module.py b/eos/saveddata/module.py index 59d2703cd..57501ca48 100644 --- a/eos/saveddata/module.py +++ b/eos/saveddata/module.py @@ -254,7 +254,7 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut): @property def falloff(self): - attrs = ("falloff", "shipScanFalloff") + attrs = ("falloff", "shipScanFalloff", "falloffEffectiveness") for attr in attrs: falloff = self.getModifiedItemAttr(attr) if falloff is not None: return falloff @@ -469,7 +469,7 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut): # Do not allow to apply offensive modules on ship with offensive module immunite, with few exceptions # (all effects which apply instant modification are exception, generally speaking) if item.offensive and projectedOnto.ship.getModifiedItemAttr("disallowOffensiveModifiers") == 1: - offensiveNonModifiers = set(("energyDestabilizationNew", "leech")) + offensiveNonModifiers = set(("energyDestabilizationNew", "leech", "energyNosferatuFalloff", "energyNeutralizerFalloff")) if not offensiveNonModifiers.intersection(set(item.effects)): return False # If assistive modules are not allowed, do not let to apply these altogether diff --git a/eve.db b/eve.db index e8b2f0337..16a4c743f 100644 Binary files a/eve.db and b/eve.db differ diff --git a/gui/builtinViews/fittingView.py b/gui/builtinViews/fittingView.py index b58674043..d16c0f251 100644 --- a/gui/builtinViews/fittingView.py +++ b/gui/builtinViews/fittingView.py @@ -526,7 +526,8 @@ class FittingView(d.Display): # update state tooltip tooltip = self.activeColumns[col].getToolTip(self.mods[self.GetItemData(row)]) - self.SetToolTipString(tooltip) + if tooltip: + self.SetToolTipString(tooltip) wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.mainFrame.getActiveFit())) else: diff --git a/imgs/icons/01_01.png b/imgs/icons/01_01.png index 7c348ac56..18ab4636a 100644 Binary files a/imgs/icons/01_01.png and b/imgs/icons/01_01.png differ diff --git a/imgs/icons/01_02.png b/imgs/icons/01_02.png index 735242073..9dd2e7c7e 100644 Binary files a/imgs/icons/01_02.png and b/imgs/icons/01_02.png differ diff --git a/imgs/icons/01_03.png b/imgs/icons/01_03.png index e62454a13..4fe0915c5 100644 Binary files a/imgs/icons/01_03.png and b/imgs/icons/01_03.png differ diff --git a/imgs/icons/01_04.png b/imgs/icons/01_04.png index 870445345..fb3fdde34 100644 Binary files a/imgs/icons/01_04.png and b/imgs/icons/01_04.png differ diff --git a/imgs/icons/01_05.png b/imgs/icons/01_05.png index 288aa22d0..5e726b2e0 100644 Binary files a/imgs/icons/01_05.png and b/imgs/icons/01_05.png differ diff --git a/imgs/icons/01_06.png b/imgs/icons/01_06.png index 690e0b6ae..fca8e6adf 100644 Binary files a/imgs/icons/01_06.png and b/imgs/icons/01_06.png differ diff --git a/imgs/icons/01_07.png b/imgs/icons/01_07.png index 54cc85636..cd9795d98 100644 Binary files a/imgs/icons/01_07.png and b/imgs/icons/01_07.png differ diff --git a/imgs/icons/01_09.png b/imgs/icons/01_09.png index d2c14c39a..e04cc55f3 100644 Binary files a/imgs/icons/01_09.png and b/imgs/icons/01_09.png differ diff --git a/imgs/icons/01_10.png b/imgs/icons/01_10.png index e87d72457..29d7a00e9 100644 Binary files a/imgs/icons/01_10.png and b/imgs/icons/01_10.png differ diff --git a/imgs/icons/01_11.png b/imgs/icons/01_11.png index 034c2cc82..0b1c8aae1 100644 Binary files a/imgs/icons/01_11.png and b/imgs/icons/01_11.png differ diff --git a/imgs/icons/01_13.png b/imgs/icons/01_13.png index 6afb6b063..891cb8ade 100644 Binary files a/imgs/icons/01_13.png and b/imgs/icons/01_13.png differ diff --git a/imgs/icons/01_15.png b/imgs/icons/01_15.png index 6e3af2a5e..f4d737360 100644 Binary files a/imgs/icons/01_15.png and b/imgs/icons/01_15.png differ diff --git a/imgs/icons/01_16.png b/imgs/icons/01_16.png index f5743acb8..e87e03d38 100644 Binary files a/imgs/icons/01_16.png and b/imgs/icons/01_16.png differ diff --git a/imgs/icons/02_02.png b/imgs/icons/02_02.png index 0c7633836..8a23bb13a 100644 Binary files a/imgs/icons/02_02.png and b/imgs/icons/02_02.png differ diff --git a/imgs/icons/02_03.png b/imgs/icons/02_03.png index 3df4972c9..04b823614 100644 Binary files a/imgs/icons/02_03.png and b/imgs/icons/02_03.png differ diff --git a/imgs/icons/02_04.png b/imgs/icons/02_04.png index 6a9778d10..ade371d04 100644 Binary files a/imgs/icons/02_04.png and b/imgs/icons/02_04.png differ diff --git a/imgs/icons/02_05.png b/imgs/icons/02_05.png index 240336fb8..30cc42153 100644 Binary files a/imgs/icons/02_05.png and b/imgs/icons/02_05.png differ diff --git a/imgs/icons/02_07.png b/imgs/icons/02_07.png index f938fb217..cf8d2316f 100644 Binary files a/imgs/icons/02_07.png and b/imgs/icons/02_07.png differ diff --git a/imgs/icons/02_09.png b/imgs/icons/02_09.png index 716e7b85b..8c6e9dba7 100644 Binary files a/imgs/icons/02_09.png and b/imgs/icons/02_09.png differ diff --git a/imgs/icons/02_10.png b/imgs/icons/02_10.png index 8d4817f9a..1b94a7e89 100644 Binary files a/imgs/icons/02_10.png and b/imgs/icons/02_10.png differ diff --git a/imgs/icons/02_12.png b/imgs/icons/02_12.png index 841b94f7b..fc3df9d0d 100644 Binary files a/imgs/icons/02_12.png and b/imgs/icons/02_12.png differ diff --git a/imgs/icons/02_14.png b/imgs/icons/02_14.png index 288520496..00c9bddf2 100644 Binary files a/imgs/icons/02_14.png and b/imgs/icons/02_14.png differ diff --git a/imgs/icons/02_16.png b/imgs/icons/02_16.png index cb978d190..38ff0119c 100644 Binary files a/imgs/icons/02_16.png and b/imgs/icons/02_16.png differ diff --git a/imgs/icons/03_01.png b/imgs/icons/03_01.png index ba0ebe4bf..1a77b62f4 100644 Binary files a/imgs/icons/03_01.png and b/imgs/icons/03_01.png differ diff --git a/imgs/icons/03_02.png b/imgs/icons/03_02.png index 0cfc86e92..0710897e5 100644 Binary files a/imgs/icons/03_02.png and b/imgs/icons/03_02.png differ diff --git a/imgs/icons/03_04.png b/imgs/icons/03_04.png index 0b00feca5..66045fdbf 100644 Binary files a/imgs/icons/03_04.png and b/imgs/icons/03_04.png differ diff --git a/imgs/icons/03_05.png b/imgs/icons/03_05.png index 2dbe0907b..5f169f2d8 100644 Binary files a/imgs/icons/03_05.png and b/imgs/icons/03_05.png differ diff --git a/imgs/icons/03_06.png b/imgs/icons/03_06.png index da54c1430..9c2b842ee 100644 Binary files a/imgs/icons/03_06.png and b/imgs/icons/03_06.png differ diff --git a/imgs/icons/03_08.png b/imgs/icons/03_08.png index 055dfbd50..7ed756d27 100644 Binary files a/imgs/icons/03_08.png and b/imgs/icons/03_08.png differ diff --git a/imgs/icons/03_09.png b/imgs/icons/03_09.png index 73ea774f5..676bdb512 100644 Binary files a/imgs/icons/03_09.png and b/imgs/icons/03_09.png differ diff --git a/imgs/icons/03_10.png b/imgs/icons/03_10.png index 411edd596..e011455db 100644 Binary files a/imgs/icons/03_10.png and b/imgs/icons/03_10.png differ diff --git a/imgs/icons/03_11.png b/imgs/icons/03_11.png index 9fa961ac4..98f8bd62f 100644 Binary files a/imgs/icons/03_11.png and b/imgs/icons/03_11.png differ diff --git a/imgs/icons/03_12.png b/imgs/icons/03_12.png index 9bcb64f51..32754d413 100644 Binary files a/imgs/icons/03_12.png and b/imgs/icons/03_12.png differ diff --git a/imgs/icons/03_13.png b/imgs/icons/03_13.png index e224a8d65..a0c394c35 100644 Binary files a/imgs/icons/03_13.png and b/imgs/icons/03_13.png differ diff --git a/imgs/icons/04_01.png b/imgs/icons/04_01.png index 9e7cb5063..b3b08894d 100644 Binary files a/imgs/icons/04_01.png and b/imgs/icons/04_01.png differ diff --git a/imgs/icons/04_09.png b/imgs/icons/04_09.png index 80670e69a..450b7d47b 100644 Binary files a/imgs/icons/04_09.png and b/imgs/icons/04_09.png differ diff --git a/imgs/icons/04_10.png b/imgs/icons/04_10.png index 3b13dd4e7..c1abda51b 100644 Binary files a/imgs/icons/04_10.png and b/imgs/icons/04_10.png differ diff --git a/imgs/icons/04_11.png b/imgs/icons/04_11.png index 6a3a9e354..d30190dd5 100644 Binary files a/imgs/icons/04_11.png and b/imgs/icons/04_11.png differ diff --git a/imgs/icons/04_12.png b/imgs/icons/04_12.png index 8f0e9408b..a127f1d4e 100644 Binary files a/imgs/icons/04_12.png and b/imgs/icons/04_12.png differ diff --git a/imgs/icons/04_13.png b/imgs/icons/04_13.png index 7ede3bdb5..0e4354dee 100644 Binary files a/imgs/icons/04_13.png and b/imgs/icons/04_13.png differ diff --git a/imgs/icons/05_01.png b/imgs/icons/05_01.png index f3770ef64..4fec42e2d 100644 Binary files a/imgs/icons/05_01.png and b/imgs/icons/05_01.png differ diff --git a/imgs/icons/05_02.png b/imgs/icons/05_02.png index 87acea25f..681c83042 100644 Binary files a/imgs/icons/05_02.png and b/imgs/icons/05_02.png differ diff --git a/imgs/icons/05_07.png b/imgs/icons/05_07.png index eb835d9f1..a9f588f47 100644 Binary files a/imgs/icons/05_07.png and b/imgs/icons/05_07.png differ diff --git a/imgs/icons/05_11.png b/imgs/icons/05_11.png deleted file mode 100644 index f39b27099..000000000 Binary files a/imgs/icons/05_11.png and /dev/null differ diff --git a/imgs/icons/05_12.png b/imgs/icons/05_12.png index 767babbb5..6e0ec8b1a 100644 Binary files a/imgs/icons/05_12.png and b/imgs/icons/05_12.png differ diff --git a/imgs/icons/05_14.png b/imgs/icons/05_14.png index 8e87fd1e7..cc60480f8 100644 Binary files a/imgs/icons/05_14.png and b/imgs/icons/05_14.png differ diff --git a/imgs/icons/07_15.png b/imgs/icons/07_15.png index 8cc35766f..3fb2ed934 100644 Binary files a/imgs/icons/07_15.png and b/imgs/icons/07_15.png differ diff --git a/imgs/icons/08_01.png b/imgs/icons/08_01.png index 95771aa98..0c658a338 100644 Binary files a/imgs/icons/08_01.png and b/imgs/icons/08_01.png differ diff --git a/imgs/icons/08_02.png b/imgs/icons/08_02.png index 906341987..3be2655ea 100644 Binary files a/imgs/icons/08_02.png and b/imgs/icons/08_02.png differ diff --git a/imgs/icons/08_03.png b/imgs/icons/08_03.png index f52a90502..4c4aec39b 100644 Binary files a/imgs/icons/08_03.png and b/imgs/icons/08_03.png differ diff --git a/imgs/icons/08_04.png b/imgs/icons/08_04.png index c11a4a9aa..037a12b48 100644 Binary files a/imgs/icons/08_04.png and b/imgs/icons/08_04.png differ diff --git a/imgs/icons/08_05.png b/imgs/icons/08_05.png index 3ce54a83b..72850a7e0 100644 Binary files a/imgs/icons/08_05.png and b/imgs/icons/08_05.png differ diff --git a/imgs/icons/08_06.png b/imgs/icons/08_06.png index e292bae56..68cf5dbda 100644 Binary files a/imgs/icons/08_06.png and b/imgs/icons/08_06.png differ diff --git a/imgs/icons/08_07.png b/imgs/icons/08_07.png index 1d05e9565..8f51f5641 100644 Binary files a/imgs/icons/08_07.png and b/imgs/icons/08_07.png differ diff --git a/imgs/icons/08_08.png b/imgs/icons/08_08.png index 3c278d0de..18ff7c523 100644 Binary files a/imgs/icons/08_08.png and b/imgs/icons/08_08.png differ diff --git a/imgs/icons/08_09.png b/imgs/icons/08_09.png index 69367c15a..bf13579e9 100644 Binary files a/imgs/icons/08_09.png and b/imgs/icons/08_09.png differ diff --git a/imgs/icons/08_10.png b/imgs/icons/08_10.png index f512f25ca..7eaa9244e 100644 Binary files a/imgs/icons/08_10.png and b/imgs/icons/08_10.png differ diff --git a/imgs/icons/08_11.png b/imgs/icons/08_11.png index c1b8fdf67..496418e48 100644 Binary files a/imgs/icons/08_11.png and b/imgs/icons/08_11.png differ diff --git a/imgs/icons/08_12.png b/imgs/icons/08_12.png index a9b26b265..d40b95f7a 100644 Binary files a/imgs/icons/08_12.png and b/imgs/icons/08_12.png differ diff --git a/imgs/icons/08_16.png b/imgs/icons/08_16.png index 612826530..d1627c050 100644 Binary files a/imgs/icons/08_16.png and b/imgs/icons/08_16.png differ diff --git a/imgs/icons/09_05.png b/imgs/icons/09_05.png index 42ecec3e4..69dd94eb8 100644 Binary files a/imgs/icons/09_05.png and b/imgs/icons/09_05.png differ diff --git a/imgs/icons/09_16.png b/imgs/icons/09_16.png index bbb9fe2d8..2f5452268 100644 Binary files a/imgs/icons/09_16.png and b/imgs/icons/09_16.png differ diff --git a/imgs/icons/10_15.png b/imgs/icons/10_15.png index f8175a48c..7dbd5378c 100644 Binary files a/imgs/icons/10_15.png and b/imgs/icons/10_15.png differ diff --git a/imgs/icons/118_12.png b/imgs/icons/118_12.png new file mode 100644 index 000000000..920b45ac8 Binary files /dev/null and b/imgs/icons/118_12.png differ diff --git a/imgs/icons/118_2.png b/imgs/icons/118_2.png new file mode 100644 index 000000000..fab256b3a Binary files /dev/null and b/imgs/icons/118_2.png differ diff --git a/imgs/icons/11_04.png b/imgs/icons/11_04.png index 706e67ea4..e1941d292 100644 Binary files a/imgs/icons/11_04.png and b/imgs/icons/11_04.png differ diff --git a/imgs/icons/11_09.png b/imgs/icons/11_09.png deleted file mode 100644 index 6c75720b9..000000000 Binary files a/imgs/icons/11_09.png and /dev/null differ diff --git a/imgs/icons/11_14.png b/imgs/icons/11_14.png deleted file mode 100644 index 75fe75cbb..000000000 Binary files a/imgs/icons/11_14.png and /dev/null differ diff --git a/imgs/icons/11_16.png b/imgs/icons/11_16.png index 9da4da16b..ab4cfd484 100644 Binary files a/imgs/icons/11_16.png and b/imgs/icons/11_16.png differ diff --git a/imgs/icons/12_04.png b/imgs/icons/12_04.png index c0df8184c..c9e983e27 100644 Binary files a/imgs/icons/12_04.png and b/imgs/icons/12_04.png differ diff --git a/imgs/icons/12_06.png b/imgs/icons/12_06.png index 1f2b5ee8d..3ff4a3a6b 100644 Binary files a/imgs/icons/12_06.png and b/imgs/icons/12_06.png differ diff --git a/imgs/icons/12_07.png b/imgs/icons/12_07.png index 63029ac7e..ff42a6205 100644 Binary files a/imgs/icons/12_07.png and b/imgs/icons/12_07.png differ diff --git a/imgs/icons/12_08.png b/imgs/icons/12_08.png index 010a1cc80..baf8f620c 100644 Binary files a/imgs/icons/12_08.png and b/imgs/icons/12_08.png differ diff --git a/imgs/icons/12_09.png b/imgs/icons/12_09.png index 50ad95864..f6690c912 100644 Binary files a/imgs/icons/12_09.png and b/imgs/icons/12_09.png differ diff --git a/imgs/icons/12_10.png b/imgs/icons/12_10.png index 76ee386bf..6f262fd22 100644 Binary files a/imgs/icons/12_10.png and b/imgs/icons/12_10.png differ diff --git a/imgs/icons/12_11.png b/imgs/icons/12_11.png index bdafd77b8..a44a89ac9 100644 Binary files a/imgs/icons/12_11.png and b/imgs/icons/12_11.png differ diff --git a/imgs/icons/12_12.png b/imgs/icons/12_12.png index d84b7c331..8c1dcddc8 100644 Binary files a/imgs/icons/12_12.png and b/imgs/icons/12_12.png differ diff --git a/imgs/icons/12_13.png b/imgs/icons/12_13.png index ed4250afd..1f9bc8eb0 100644 Binary files a/imgs/icons/12_13.png and b/imgs/icons/12_13.png differ diff --git a/imgs/icons/12_14.png b/imgs/icons/12_14.png index 5a5a3765b..fd1892ff3 100644 Binary files a/imgs/icons/12_14.png and b/imgs/icons/12_14.png differ diff --git a/imgs/icons/12_15.png b/imgs/icons/12_15.png index cbb20242b..be11dd10b 100644 Binary files a/imgs/icons/12_15.png and b/imgs/icons/12_15.png differ diff --git a/imgs/icons/12_16.png b/imgs/icons/12_16.png index b9fe79ded..cc7cfbc29 100644 Binary files a/imgs/icons/12_16.png and b/imgs/icons/12_16.png differ diff --git a/imgs/icons/13_01.png b/imgs/icons/13_01.png index 891eaeef8..637e61d5d 100644 Binary files a/imgs/icons/13_01.png and b/imgs/icons/13_01.png differ diff --git a/imgs/icons/13_02.png b/imgs/icons/13_02.png index ece9b70d6..705285b69 100644 Binary files a/imgs/icons/13_02.png and b/imgs/icons/13_02.png differ diff --git a/imgs/icons/13_03.png b/imgs/icons/13_03.png index 4d1696a2d..0981ac049 100644 Binary files a/imgs/icons/13_03.png and b/imgs/icons/13_03.png differ diff --git a/imgs/icons/13_04.png b/imgs/icons/13_04.png index 6ce3329c0..c2236a20b 100644 Binary files a/imgs/icons/13_04.png and b/imgs/icons/13_04.png differ diff --git a/imgs/icons/13_05.png b/imgs/icons/13_05.png index ff6d3d345..74638ffff 100644 Binary files a/imgs/icons/13_05.png and b/imgs/icons/13_05.png differ diff --git a/imgs/icons/13_06.png b/imgs/icons/13_06.png index 4685a0c46..fcf429c03 100644 Binary files a/imgs/icons/13_06.png and b/imgs/icons/13_06.png differ diff --git a/imgs/icons/13_07.png b/imgs/icons/13_07.png index f6d7bd795..2fad5a6a5 100644 Binary files a/imgs/icons/13_07.png and b/imgs/icons/13_07.png differ diff --git a/imgs/icons/13_08.png b/imgs/icons/13_08.png index 4f1ae0a95..d76160311 100644 Binary files a/imgs/icons/13_08.png and b/imgs/icons/13_08.png differ diff --git a/imgs/icons/13_09.png b/imgs/icons/13_09.png index 8009d02ed..30cff32ef 100644 Binary files a/imgs/icons/13_09.png and b/imgs/icons/13_09.png differ diff --git a/imgs/icons/13_10.png b/imgs/icons/13_10.png index d9558a229..f59d9e172 100644 Binary files a/imgs/icons/13_10.png and b/imgs/icons/13_10.png differ diff --git a/imgs/icons/13_11.png b/imgs/icons/13_11.png index 65e2c404d..eb7704a87 100644 Binary files a/imgs/icons/13_11.png and b/imgs/icons/13_11.png differ diff --git a/imgs/icons/13_12.png b/imgs/icons/13_12.png index b7a4833f3..f8bb99c11 100644 Binary files a/imgs/icons/13_12.png and b/imgs/icons/13_12.png differ diff --git a/imgs/icons/13_13.png b/imgs/icons/13_13.png index c81e63ead..48ab6dda6 100644 Binary files a/imgs/icons/13_13.png and b/imgs/icons/13_13.png differ diff --git a/imgs/icons/13_14.png b/imgs/icons/13_14.png index c9d342bae..8b6814978 100644 Binary files a/imgs/icons/13_14.png and b/imgs/icons/13_14.png differ diff --git a/imgs/icons/13_15.png b/imgs/icons/13_15.png index 764660bb4..22b3a7f91 100644 Binary files a/imgs/icons/13_15.png and b/imgs/icons/13_15.png differ diff --git a/imgs/icons/13_16.png b/imgs/icons/13_16.png index b21adbaea..ca02e16fb 100644 Binary files a/imgs/icons/13_16.png and b/imgs/icons/13_16.png differ diff --git a/imgs/icons/14_01.png b/imgs/icons/14_01.png index 359f8e37f..d9f3b4a1d 100644 Binary files a/imgs/icons/14_01.png and b/imgs/icons/14_01.png differ diff --git a/imgs/icons/14_02.png b/imgs/icons/14_02.png index d1e622452..ba0604fb0 100644 Binary files a/imgs/icons/14_02.png and b/imgs/icons/14_02.png differ diff --git a/imgs/icons/14_03.png b/imgs/icons/14_03.png index 0ad273970..33857cec7 100644 Binary files a/imgs/icons/14_03.png and b/imgs/icons/14_03.png differ diff --git a/imgs/icons/14_04.png b/imgs/icons/14_04.png index 57b814a9b..9a3b11b24 100644 Binary files a/imgs/icons/14_04.png and b/imgs/icons/14_04.png differ diff --git a/imgs/icons/14_05.png b/imgs/icons/14_05.png index 1f7fada49..06695d3a1 100644 Binary files a/imgs/icons/14_05.png and b/imgs/icons/14_05.png differ diff --git a/imgs/icons/14_06.png b/imgs/icons/14_06.png index ce9b4f4f4..c668482a0 100644 Binary files a/imgs/icons/14_06.png and b/imgs/icons/14_06.png differ diff --git a/imgs/icons/14_07.png b/imgs/icons/14_07.png index bc3a0b5d0..70efd09b7 100644 Binary files a/imgs/icons/14_07.png and b/imgs/icons/14_07.png differ diff --git a/imgs/icons/14_08.png b/imgs/icons/14_08.png index 33d8e86a3..f2ad1c32d 100644 Binary files a/imgs/icons/14_08.png and b/imgs/icons/14_08.png differ diff --git a/imgs/icons/14_09.png b/imgs/icons/14_09.png index e2ec73c6e..cff3e612e 100644 Binary files a/imgs/icons/14_09.png and b/imgs/icons/14_09.png differ diff --git a/imgs/icons/14_10.png b/imgs/icons/14_10.png index 492189081..7f0a3ae6c 100644 Binary files a/imgs/icons/14_10.png and b/imgs/icons/14_10.png differ diff --git a/imgs/icons/14_11.png b/imgs/icons/14_11.png index d54fb795e..df8a0e941 100644 Binary files a/imgs/icons/14_11.png and b/imgs/icons/14_11.png differ diff --git a/imgs/icons/14_12.png b/imgs/icons/14_12.png index 6a4c61752..2fbb77cbc 100644 Binary files a/imgs/icons/14_12.png and b/imgs/icons/14_12.png differ diff --git a/imgs/icons/14_13.png b/imgs/icons/14_13.png index 3c3d13ec1..dbddc16c4 100644 Binary files a/imgs/icons/14_13.png and b/imgs/icons/14_13.png differ diff --git a/imgs/icons/14_14.png b/imgs/icons/14_14.png index 4eb1fcecc..f58946b27 100644 Binary files a/imgs/icons/14_14.png and b/imgs/icons/14_14.png differ diff --git a/imgs/icons/14_15.png b/imgs/icons/14_15.png index b48fb5d14..e550a788e 100644 Binary files a/imgs/icons/14_15.png and b/imgs/icons/14_15.png differ diff --git a/imgs/icons/14_16.png b/imgs/icons/14_16.png index 3699371a0..9537a0469 100644 Binary files a/imgs/icons/14_16.png and b/imgs/icons/14_16.png differ diff --git a/imgs/icons/15_01.png b/imgs/icons/15_01.png index 58d528b6b..6d9f8a0df 100644 Binary files a/imgs/icons/15_01.png and b/imgs/icons/15_01.png differ diff --git a/imgs/icons/15_02.png b/imgs/icons/15_02.png index c9d470e27..2b0a1a8dc 100644 Binary files a/imgs/icons/15_02.png and b/imgs/icons/15_02.png differ diff --git a/imgs/icons/15_03.png b/imgs/icons/15_03.png index c8e96e617..03f6f5dfc 100644 Binary files a/imgs/icons/15_03.png and b/imgs/icons/15_03.png differ diff --git a/imgs/icons/15_04.png b/imgs/icons/15_04.png index ebfeed68d..9ac4059b3 100644 Binary files a/imgs/icons/15_04.png and b/imgs/icons/15_04.png differ diff --git a/imgs/icons/15_05.png b/imgs/icons/15_05.png index e5fad83db..aa81ce6db 100644 Binary files a/imgs/icons/15_05.png and b/imgs/icons/15_05.png differ diff --git a/imgs/icons/15_06.png b/imgs/icons/15_06.png index 80b24a916..61b2de68d 100644 Binary files a/imgs/icons/15_06.png and b/imgs/icons/15_06.png differ diff --git a/imgs/icons/15_07.png b/imgs/icons/15_07.png index 6e129dd44..f2022f779 100644 Binary files a/imgs/icons/15_07.png and b/imgs/icons/15_07.png differ diff --git a/imgs/icons/15_08.png b/imgs/icons/15_08.png index 55bf0d371..36eb0a89c 100644 Binary files a/imgs/icons/15_08.png and b/imgs/icons/15_08.png differ diff --git a/imgs/icons/15_09.png b/imgs/icons/15_09.png index 7d91c96c4..9ae32d4f4 100644 Binary files a/imgs/icons/15_09.png and b/imgs/icons/15_09.png differ diff --git a/imgs/icons/15_10.png b/imgs/icons/15_10.png index bceba86fa..74dc5dfd7 100644 Binary files a/imgs/icons/15_10.png and b/imgs/icons/15_10.png differ diff --git a/imgs/icons/15_11.png b/imgs/icons/15_11.png index cb5c2e33e..2ccab0664 100644 Binary files a/imgs/icons/15_11.png and b/imgs/icons/15_11.png differ diff --git a/imgs/icons/15_12.png b/imgs/icons/15_12.png index e9df7febe..82273ed2f 100644 Binary files a/imgs/icons/15_12.png and b/imgs/icons/15_12.png differ diff --git a/imgs/icons/15_13.png b/imgs/icons/15_13.png index e84a29844..9db97512f 100644 Binary files a/imgs/icons/15_13.png and b/imgs/icons/15_13.png differ diff --git a/imgs/icons/15_14.png b/imgs/icons/15_14.png index 2b332ace1..4de852066 100644 Binary files a/imgs/icons/15_14.png and b/imgs/icons/15_14.png differ diff --git a/imgs/icons/15_15.png b/imgs/icons/15_15.png index 0cbaed39d..dbd762869 100644 Binary files a/imgs/icons/15_15.png and b/imgs/icons/15_15.png differ diff --git a/imgs/icons/15_16.png b/imgs/icons/15_16.png index d70289469..72128e54f 100644 Binary files a/imgs/icons/15_16.png and b/imgs/icons/15_16.png differ diff --git a/imgs/icons/16_01.png b/imgs/icons/16_01.png index 69558d0df..2243a9065 100644 Binary files a/imgs/icons/16_01.png and b/imgs/icons/16_01.png differ diff --git a/imgs/icons/16_02.png b/imgs/icons/16_02.png index 68d69e207..944135165 100644 Binary files a/imgs/icons/16_02.png and b/imgs/icons/16_02.png differ diff --git a/imgs/icons/16_03.png b/imgs/icons/16_03.png index 09e961a72..69a79945d 100644 Binary files a/imgs/icons/16_03.png and b/imgs/icons/16_03.png differ diff --git a/imgs/icons/16_04.png b/imgs/icons/16_04.png index 2297b4cb1..4687d215f 100644 Binary files a/imgs/icons/16_04.png and b/imgs/icons/16_04.png differ diff --git a/imgs/icons/16_05.png b/imgs/icons/16_05.png index 281925f93..5556ca7db 100644 Binary files a/imgs/icons/16_05.png and b/imgs/icons/16_05.png differ diff --git a/imgs/icons/16_06.png b/imgs/icons/16_06.png index c9d34e704..7e34f47f5 100644 Binary files a/imgs/icons/16_06.png and b/imgs/icons/16_06.png differ diff --git a/imgs/icons/16_07.png b/imgs/icons/16_07.png index af2ba766b..087da1fd3 100644 Binary files a/imgs/icons/16_07.png and b/imgs/icons/16_07.png differ diff --git a/imgs/icons/16_08.png b/imgs/icons/16_08.png index 61040e090..7294b222f 100644 Binary files a/imgs/icons/16_08.png and b/imgs/icons/16_08.png differ diff --git a/imgs/icons/16_09.png b/imgs/icons/16_09.png index 9e38bf21b..a65aa5038 100644 Binary files a/imgs/icons/16_09.png and b/imgs/icons/16_09.png differ diff --git a/imgs/icons/16_10.png b/imgs/icons/16_10.png index 585279bc1..d755d6a34 100644 Binary files a/imgs/icons/16_10.png and b/imgs/icons/16_10.png differ diff --git a/imgs/icons/16_11.png b/imgs/icons/16_11.png index ee6f77dc3..da00ad6bd 100644 Binary files a/imgs/icons/16_11.png and b/imgs/icons/16_11.png differ diff --git a/imgs/icons/16_12.png b/imgs/icons/16_12.png index ca93a994f..c224716ab 100644 Binary files a/imgs/icons/16_12.png and b/imgs/icons/16_12.png differ diff --git a/imgs/icons/16_13.png b/imgs/icons/16_13.png index 6390a9631..10d80dc0b 100644 Binary files a/imgs/icons/16_13.png and b/imgs/icons/16_13.png differ diff --git a/imgs/icons/16_14.png b/imgs/icons/16_14.png index 9b46e2189..a08739292 100644 Binary files a/imgs/icons/16_14.png and b/imgs/icons/16_14.png differ diff --git a/imgs/icons/16_15.png b/imgs/icons/16_15.png index 527a2330b..fda1d2108 100644 Binary files a/imgs/icons/16_15.png and b/imgs/icons/16_15.png differ diff --git a/imgs/icons/16_16.png b/imgs/icons/16_16.png index 919fa075f..bdb50fbaf 100644 Binary files a/imgs/icons/16_16.png and b/imgs/icons/16_16.png differ diff --git a/imgs/icons/20_01.png b/imgs/icons/20_01.png index 515a1c7a9..5c716771a 100644 Binary files a/imgs/icons/20_01.png and b/imgs/icons/20_01.png differ diff --git a/imgs/icons/20_02.png b/imgs/icons/20_02.png index 4c0779195..b30939dea 100644 Binary files a/imgs/icons/20_02.png and b/imgs/icons/20_02.png differ diff --git a/imgs/icons/20_03.png b/imgs/icons/20_03.png index 86e889735..04593a424 100644 Binary files a/imgs/icons/20_03.png and b/imgs/icons/20_03.png differ diff --git a/imgs/icons/20_04.png b/imgs/icons/20_04.png index 6075dc439..7187fc0d2 100644 Binary files a/imgs/icons/20_04.png and b/imgs/icons/20_04.png differ diff --git a/imgs/icons/20_05.png b/imgs/icons/20_05.png index fd8953c84..23eb86d0f 100644 Binary files a/imgs/icons/20_05.png and b/imgs/icons/20_05.png differ diff --git a/imgs/icons/20_06.png b/imgs/icons/20_06.png index ebeebcc50..83e0b8034 100644 Binary files a/imgs/icons/20_06.png and b/imgs/icons/20_06.png differ diff --git a/imgs/icons/20_07.png b/imgs/icons/20_07.png index 498bec6dd..8b0acdade 100644 Binary files a/imgs/icons/20_07.png and b/imgs/icons/20_07.png differ diff --git a/imgs/icons/20_08.png b/imgs/icons/20_08.png index ed77340b7..231035a63 100644 Binary files a/imgs/icons/20_08.png and b/imgs/icons/20_08.png differ diff --git a/imgs/icons/20_09.png b/imgs/icons/20_09.png index 959ca0464..ee3dad52b 100644 Binary files a/imgs/icons/20_09.png and b/imgs/icons/20_09.png differ diff --git a/imgs/icons/20_10.png b/imgs/icons/20_10.png index fbaea3277..6d0670e65 100644 Binary files a/imgs/icons/20_10.png and b/imgs/icons/20_10.png differ diff --git a/imgs/icons/20_11.png b/imgs/icons/20_11.png index de865c14f..84a9653be 100644 Binary files a/imgs/icons/20_11.png and b/imgs/icons/20_11.png differ diff --git a/imgs/icons/20_12.png b/imgs/icons/20_12.png index e421993a8..295c4c10a 100644 Binary files a/imgs/icons/20_12.png and b/imgs/icons/20_12.png differ diff --git a/imgs/icons/20_13.png b/imgs/icons/20_13.png index 162d9d3b9..ed20d1cec 100644 Binary files a/imgs/icons/20_13.png and b/imgs/icons/20_13.png differ diff --git a/imgs/icons/20_14.png b/imgs/icons/20_14.png index 11e811782..df9b1e890 100644 Binary files a/imgs/icons/20_14.png and b/imgs/icons/20_14.png differ diff --git a/imgs/icons/20_15.png b/imgs/icons/20_15.png index a63b85bc3..b5ee9c96f 100644 Binary files a/imgs/icons/20_15.png and b/imgs/icons/20_15.png differ diff --git a/imgs/icons/20_16.png b/imgs/icons/20_16.png index 29b522e7c..5274bdc9b 100644 Binary files a/imgs/icons/20_16.png and b/imgs/icons/20_16.png differ diff --git a/imgs/icons/21_01.png b/imgs/icons/21_01.png index 9ba78db57..46a5a4ae0 100644 Binary files a/imgs/icons/21_01.png and b/imgs/icons/21_01.png differ diff --git a/imgs/icons/21_02.png b/imgs/icons/21_02.png index cbcc746b0..ed1d65f9f 100644 Binary files a/imgs/icons/21_02.png and b/imgs/icons/21_02.png differ diff --git a/imgs/icons/21_03.png b/imgs/icons/21_03.png index 5fdc345da..15dc75381 100644 Binary files a/imgs/icons/21_03.png and b/imgs/icons/21_03.png differ diff --git a/imgs/icons/21_05.png b/imgs/icons/21_05.png index 9a794f584..d93fabca0 100644 Binary files a/imgs/icons/21_05.png and b/imgs/icons/21_05.png differ diff --git a/imgs/icons/21_06.png b/imgs/icons/21_06.png index ae8a60696..95eb3199d 100644 Binary files a/imgs/icons/21_06.png and b/imgs/icons/21_06.png differ diff --git a/imgs/icons/21_07.png b/imgs/icons/21_07.png index d206009cb..d725ce99e 100644 Binary files a/imgs/icons/21_07.png and b/imgs/icons/21_07.png differ diff --git a/imgs/icons/21_08.png b/imgs/icons/21_08.png deleted file mode 100644 index 3b8e37970..000000000 Binary files a/imgs/icons/21_08.png and /dev/null differ diff --git a/imgs/icons/21_09.png b/imgs/icons/21_09.png index 32840e056..0d1a42015 100644 Binary files a/imgs/icons/21_09.png and b/imgs/icons/21_09.png differ diff --git a/imgs/icons/21_10.png b/imgs/icons/21_10.png index 72af02062..7ba85bc69 100644 Binary files a/imgs/icons/21_10.png and b/imgs/icons/21_10.png differ diff --git a/imgs/icons/21_11.png b/imgs/icons/21_11.png index 86f2fec39..2cc93e5d4 100644 Binary files a/imgs/icons/21_11.png and b/imgs/icons/21_11.png differ diff --git a/imgs/icons/21_12.png b/imgs/icons/21_12.png index b38113da6..7006513dd 100644 Binary files a/imgs/icons/21_12.png and b/imgs/icons/21_12.png differ diff --git a/imgs/icons/21_13.png b/imgs/icons/21_13.png index 17c0526d0..9e91f0417 100644 Binary files a/imgs/icons/21_13.png and b/imgs/icons/21_13.png differ diff --git a/imgs/icons/21_14.png b/imgs/icons/21_14.png index 472d69bac..80797a1f9 100644 Binary files a/imgs/icons/21_14.png and b/imgs/icons/21_14.png differ diff --git a/imgs/icons/21_15.png b/imgs/icons/21_15.png index 6608344d0..d7ada1bcc 100644 Binary files a/imgs/icons/21_15.png and b/imgs/icons/21_15.png differ diff --git a/imgs/icons/21_16.png b/imgs/icons/21_16.png index bee819645..9c2bb5b62 100644 Binary files a/imgs/icons/21_16.png and b/imgs/icons/21_16.png differ diff --git a/imgs/icons/22_01.png b/imgs/icons/22_01.png index dfbbfa72c..ef009dbdd 100644 Binary files a/imgs/icons/22_01.png and b/imgs/icons/22_01.png differ diff --git a/imgs/icons/22_02.png b/imgs/icons/22_02.png index b84596f68..6a9d44e5d 100644 Binary files a/imgs/icons/22_02.png and b/imgs/icons/22_02.png differ diff --git a/imgs/icons/22_03.png b/imgs/icons/22_03.png index ec090c11f..a9a21d47b 100644 Binary files a/imgs/icons/22_03.png and b/imgs/icons/22_03.png differ diff --git a/imgs/icons/22_04.png b/imgs/icons/22_04.png index 981f2f8a1..2c23d35b1 100644 Binary files a/imgs/icons/22_04.png and b/imgs/icons/22_04.png differ diff --git a/imgs/icons/22_05.png b/imgs/icons/22_05.png index 0b3d935ec..95b171173 100644 Binary files a/imgs/icons/22_05.png and b/imgs/icons/22_05.png differ diff --git a/imgs/icons/22_06.png b/imgs/icons/22_06.png index de208f040..ea8431c1d 100644 Binary files a/imgs/icons/22_06.png and b/imgs/icons/22_06.png differ diff --git a/imgs/icons/22_07.png b/imgs/icons/22_07.png index 0f5e74391..33d423310 100644 Binary files a/imgs/icons/22_07.png and b/imgs/icons/22_07.png differ diff --git a/imgs/icons/22_08.png b/imgs/icons/22_08.png deleted file mode 100644 index 0e1ef965a..000000000 Binary files a/imgs/icons/22_08.png and /dev/null differ diff --git a/imgs/icons/22_09.png b/imgs/icons/22_09.png index ac912c91a..46249feb3 100644 Binary files a/imgs/icons/22_09.png and b/imgs/icons/22_09.png differ diff --git a/imgs/icons/22_10.png b/imgs/icons/22_10.png index 2739d7779..a04a38ad9 100644 Binary files a/imgs/icons/22_10.png and b/imgs/icons/22_10.png differ diff --git a/imgs/icons/22_11.png b/imgs/icons/22_11.png index db13afd6d..3723cabb6 100644 Binary files a/imgs/icons/22_11.png and b/imgs/icons/22_11.png differ diff --git a/imgs/icons/22_12.png b/imgs/icons/22_12.png index 2e80d82ce..f2872d162 100644 Binary files a/imgs/icons/22_12.png and b/imgs/icons/22_12.png differ diff --git a/imgs/icons/22_13.png b/imgs/icons/22_13.png index ff56d8a06..8b0f2abef 100644 Binary files a/imgs/icons/22_13.png and b/imgs/icons/22_13.png differ diff --git a/imgs/icons/22_14.png b/imgs/icons/22_14.png index 64b14cac2..723419683 100644 Binary files a/imgs/icons/22_14.png and b/imgs/icons/22_14.png differ diff --git a/imgs/icons/22_15.png b/imgs/icons/22_15.png index ab9f7863a..85be4ddfa 100644 Binary files a/imgs/icons/22_15.png and b/imgs/icons/22_15.png differ diff --git a/imgs/icons/22_16.png b/imgs/icons/22_16.png index 66a57e26a..127ab999f 100644 Binary files a/imgs/icons/22_16.png and b/imgs/icons/22_16.png differ diff --git a/imgs/icons/22_17.png b/imgs/icons/22_17.png index 5f8d04f5b..fb161b9b4 100644 Binary files a/imgs/icons/22_17.png and b/imgs/icons/22_17.png differ diff --git a/imgs/icons/22_18.png b/imgs/icons/22_18.png index 3b2076994..807af6fe3 100644 Binary files a/imgs/icons/22_18.png and b/imgs/icons/22_18.png differ diff --git a/imgs/icons/22_19.png b/imgs/icons/22_19.png index 515f96b0e..5527e13af 100644 Binary files a/imgs/icons/22_19.png and b/imgs/icons/22_19.png differ diff --git a/imgs/icons/22_20.png b/imgs/icons/22_20.png index 48afc2774..6fd0aa4db 100644 Binary files a/imgs/icons/22_20.png and b/imgs/icons/22_20.png differ diff --git a/imgs/icons/22_21.png b/imgs/icons/22_21.png index 2c2328f09..aa9ec3e69 100644 Binary files a/imgs/icons/22_21.png and b/imgs/icons/22_21.png differ diff --git a/imgs/icons/22_22.png b/imgs/icons/22_22.png index 35a47ea13..4b9606e91 100644 Binary files a/imgs/icons/22_22.png and b/imgs/icons/22_22.png differ diff --git a/imgs/icons/22_23.png b/imgs/icons/22_23.png index 36d1d4a8d..e13571e05 100644 Binary files a/imgs/icons/22_23.png and b/imgs/icons/22_23.png differ diff --git a/imgs/icons/22_24.png b/imgs/icons/22_24.png index e5604f088..bc19ac7f9 100644 Binary files a/imgs/icons/22_24.png and b/imgs/icons/22_24.png differ diff --git a/imgs/icons/22_25.png b/imgs/icons/22_25.png index 61f166d4a..e6f7a22c9 100644 Binary files a/imgs/icons/22_25.png and b/imgs/icons/22_25.png differ diff --git a/imgs/icons/22_26.png b/imgs/icons/22_26.png index 75a5baf2b..ebcd00a08 100644 Binary files a/imgs/icons/22_26.png and b/imgs/icons/22_26.png differ diff --git a/imgs/icons/22_27.png b/imgs/icons/22_27.png index d2fafe9f5..f853ef5d6 100644 Binary files a/imgs/icons/22_27.png and b/imgs/icons/22_27.png differ diff --git a/imgs/icons/22_28.png b/imgs/icons/22_28.png index 29d0bd220..28fa8f7d1 100644 Binary files a/imgs/icons/22_28.png and b/imgs/icons/22_28.png differ diff --git a/imgs/icons/25_04.png b/imgs/icons/25_04.png index b2ab58773..3b3885d0b 100644 Binary files a/imgs/icons/25_04.png and b/imgs/icons/25_04.png differ diff --git a/imgs/icons/26_01.png b/imgs/icons/26_01.png index b42cff607..76a54433e 100644 Binary files a/imgs/icons/26_01.png and b/imgs/icons/26_01.png differ diff --git a/imgs/icons/26_11.png b/imgs/icons/26_11.png index da3fd5663..c8c1f0afc 100644 Binary files a/imgs/icons/26_11.png and b/imgs/icons/26_11.png differ diff --git a/imgs/icons/26_12.png b/imgs/icons/26_12.png deleted file mode 100644 index c6c614ccf..000000000 Binary files a/imgs/icons/26_12.png and /dev/null differ diff --git a/imgs/icons/26_13.png b/imgs/icons/26_13.png deleted file mode 100644 index a645d2fd8..000000000 Binary files a/imgs/icons/26_13.png and /dev/null differ diff --git a/imgs/icons/26_14.png b/imgs/icons/26_14.png deleted file mode 100644 index 7701b1d7c..000000000 Binary files a/imgs/icons/26_14.png and /dev/null differ diff --git a/imgs/icons/26_15.png b/imgs/icons/26_15.png deleted file mode 100644 index a932f95b0..000000000 Binary files a/imgs/icons/26_15.png and /dev/null differ diff --git a/imgs/icons/26_16.png b/imgs/icons/26_16.png deleted file mode 100644 index 85c5dcb25..000000000 Binary files a/imgs/icons/26_16.png and /dev/null differ diff --git a/imgs/icons/27_01.png b/imgs/icons/27_01.png deleted file mode 100644 index 700846655..000000000 Binary files a/imgs/icons/27_01.png and /dev/null differ diff --git a/imgs/icons/27_04.png b/imgs/icons/27_04.png deleted file mode 100644 index bea7e6734..000000000 Binary files a/imgs/icons/27_04.png and /dev/null differ diff --git a/imgs/icons/27_05.png b/imgs/icons/27_05.png deleted file mode 100644 index aaa52f31e..000000000 Binary files a/imgs/icons/27_05.png and /dev/null differ diff --git a/imgs/icons/27_09.png b/imgs/icons/27_09.png index 63c95f61d..12a55cb53 100644 Binary files a/imgs/icons/27_09.png and b/imgs/icons/27_09.png differ diff --git a/imgs/icons/31_10.png b/imgs/icons/31_10.png deleted file mode 100644 index 282be8a9a..000000000 Binary files a/imgs/icons/31_10.png and /dev/null differ diff --git a/imgs/icons/31_11.png b/imgs/icons/31_11.png deleted file mode 100644 index 3f2c9b399..000000000 Binary files a/imgs/icons/31_11.png and /dev/null differ diff --git a/imgs/icons/31_12.png b/imgs/icons/31_12.png deleted file mode 100644 index ba0fd75e8..000000000 Binary files a/imgs/icons/31_12.png and /dev/null differ diff --git a/imgs/icons/31_14.png b/imgs/icons/31_14.png index 3c36f1244..57238dcbe 100644 Binary files a/imgs/icons/31_14.png and b/imgs/icons/31_14.png differ diff --git a/imgs/icons/31_15.png b/imgs/icons/31_15.png index 907d00630..80549fac3 100644 Binary files a/imgs/icons/31_15.png and b/imgs/icons/31_15.png differ diff --git a/imgs/icons/31_16.png b/imgs/icons/31_16.png index 3e914b732..97f25f619 100644 Binary files a/imgs/icons/31_16.png and b/imgs/icons/31_16.png differ diff --git a/imgs/icons/34_01.png b/imgs/icons/34_01.png index bb7dc4459..513dd3f2e 100644 Binary files a/imgs/icons/34_01.png and b/imgs/icons/34_01.png differ diff --git a/imgs/icons/34_02.png b/imgs/icons/34_02.png index c92a18713..a5dbb061f 100644 Binary files a/imgs/icons/34_02.png and b/imgs/icons/34_02.png differ diff --git a/imgs/icons/34_12.png b/imgs/icons/34_12.png index 49cc0ce0d..29cfb7212 100644 Binary files a/imgs/icons/34_12.png and b/imgs/icons/34_12.png differ diff --git a/imgs/icons/34_15.png b/imgs/icons/34_15.png index 12fb8c616..855292c30 100644 Binary files a/imgs/icons/34_15.png and b/imgs/icons/34_15.png differ diff --git a/imgs/icons/35_01.png b/imgs/icons/35_01.png index 095ec349c..d734b0a8b 100644 Binary files a/imgs/icons/35_01.png and b/imgs/icons/35_01.png differ diff --git a/imgs/icons/35_03.png b/imgs/icons/35_03.png index 7bf7f4a0e..072eed58c 100644 Binary files a/imgs/icons/35_03.png and b/imgs/icons/35_03.png differ diff --git a/imgs/icons/35_07.png b/imgs/icons/35_07.png deleted file mode 100644 index 8ec572bfb..000000000 Binary files a/imgs/icons/35_07.png and /dev/null differ diff --git a/imgs/icons/35_08.png b/imgs/icons/35_08.png deleted file mode 100644 index 6e9dfa35e..000000000 Binary files a/imgs/icons/35_08.png and /dev/null differ diff --git a/imgs/icons/35_09.png b/imgs/icons/35_09.png index a0a4138ab..b74e9384d 100644 Binary files a/imgs/icons/35_09.png and b/imgs/icons/35_09.png differ diff --git a/imgs/icons/35_12.png b/imgs/icons/35_12.png index 91186cc77..3df287f44 100644 Binary files a/imgs/icons/35_12.png and b/imgs/icons/35_12.png differ diff --git a/imgs/icons/35_14.png b/imgs/icons/35_14.png index 371c60e10..500847420 100644 Binary files a/imgs/icons/35_14.png and b/imgs/icons/35_14.png differ diff --git a/imgs/icons/35_15.png b/imgs/icons/35_15.png index d14dd70db..da171e388 100644 Binary files a/imgs/icons/35_15.png and b/imgs/icons/35_15.png differ diff --git a/imgs/icons/36_13.png b/imgs/icons/36_13.png deleted file mode 100644 index 520f5e957..000000000 Binary files a/imgs/icons/36_13.png and /dev/null differ diff --git a/imgs/icons/37_12.png b/imgs/icons/37_12.png deleted file mode 100644 index 5653703d5..000000000 Binary files a/imgs/icons/37_12.png and /dev/null differ diff --git a/imgs/icons/40_14.png b/imgs/icons/40_14.png index 47b82c615..e05999537 100644 Binary files a/imgs/icons/40_14.png and b/imgs/icons/40_14.png differ diff --git a/imgs/icons/40_16.png b/imgs/icons/40_16.png index 04aa256ed..58b63b045 100644 Binary files a/imgs/icons/40_16.png and b/imgs/icons/40_16.png differ diff --git a/imgs/icons/45_11.png b/imgs/icons/45_11.png index 9a5970661..12e9a3f72 100644 Binary files a/imgs/icons/45_11.png and b/imgs/icons/45_11.png differ diff --git a/imgs/icons/45_12.png b/imgs/icons/45_12.png deleted file mode 100644 index da68eb2d1..000000000 Binary files a/imgs/icons/45_12.png and /dev/null differ diff --git a/imgs/icons/48_01.png b/imgs/icons/48_01.png index 3ea641d3c..16617d7ac 100644 Binary files a/imgs/icons/48_01.png and b/imgs/icons/48_01.png differ diff --git a/imgs/icons/48_02.png b/imgs/icons/48_02.png index 79cebde2b..75cb7abd3 100644 Binary files a/imgs/icons/48_02.png and b/imgs/icons/48_02.png differ diff --git a/imgs/icons/48_03.png b/imgs/icons/48_03.png index 256c68dd5..5a93a7af5 100644 Binary files a/imgs/icons/48_03.png and b/imgs/icons/48_03.png differ diff --git a/imgs/icons/48_04.png b/imgs/icons/48_04.png index 079426359..fbfd282a9 100644 Binary files a/imgs/icons/48_04.png and b/imgs/icons/48_04.png differ diff --git a/imgs/icons/48_05.png b/imgs/icons/48_05.png index 50a548011..733fa656c 100644 Binary files a/imgs/icons/48_05.png and b/imgs/icons/48_05.png differ diff --git a/imgs/icons/48_06.png b/imgs/icons/48_06.png index 07e7e4346..aa9481872 100644 Binary files a/imgs/icons/48_06.png and b/imgs/icons/48_06.png differ diff --git a/imgs/icons/48_07.png b/imgs/icons/48_07.png index 01972724c..dd95232b3 100644 Binary files a/imgs/icons/48_07.png and b/imgs/icons/48_07.png differ diff --git a/imgs/icons/48_08.png b/imgs/icons/48_08.png index 8ea06961b..317d147a6 100644 Binary files a/imgs/icons/48_08.png and b/imgs/icons/48_08.png differ diff --git a/imgs/icons/48_09.png b/imgs/icons/48_09.png index bb392da68..59c29b0cd 100644 Binary files a/imgs/icons/48_09.png and b/imgs/icons/48_09.png differ diff --git a/imgs/icons/48_10.png b/imgs/icons/48_10.png index 1ea49dfe3..c1baf2e89 100644 Binary files a/imgs/icons/48_10.png and b/imgs/icons/48_10.png differ diff --git a/imgs/icons/48_11.png b/imgs/icons/48_11.png index 630ceec6b..f835381d6 100644 Binary files a/imgs/icons/48_11.png and b/imgs/icons/48_11.png differ diff --git a/imgs/icons/48_12.png b/imgs/icons/48_12.png index dc9f55560..996e80f16 100644 Binary files a/imgs/icons/48_12.png and b/imgs/icons/48_12.png differ diff --git a/imgs/icons/48_13.png b/imgs/icons/48_13.png index 8c0c9211f..54a93e43a 100644 Binary files a/imgs/icons/48_13.png and b/imgs/icons/48_13.png differ diff --git a/imgs/icons/48_14.png b/imgs/icons/48_14.png index f3df5af22..49a8255e2 100644 Binary files a/imgs/icons/48_14.png and b/imgs/icons/48_14.png differ diff --git a/imgs/icons/48_15.png b/imgs/icons/48_15.png index ed40b8b57..a70664d01 100644 Binary files a/imgs/icons/48_15.png and b/imgs/icons/48_15.png differ diff --git a/imgs/icons/48_16.png b/imgs/icons/48_16.png index 81041488b..63c0e3cb6 100644 Binary files a/imgs/icons/48_16.png and b/imgs/icons/48_16.png differ diff --git a/imgs/icons/49_05.png b/imgs/icons/49_05.png index 36ea32394..d74e953b9 100644 Binary files a/imgs/icons/49_05.png and b/imgs/icons/49_05.png differ diff --git a/imgs/icons/49_06.png b/imgs/icons/49_06.png index 5c7148f1a..a5142f64a 100644 Binary files a/imgs/icons/49_06.png and b/imgs/icons/49_06.png differ diff --git a/imgs/icons/49_07.png b/imgs/icons/49_07.png index 5aaa37adb..50fa37dfb 100644 Binary files a/imgs/icons/49_07.png and b/imgs/icons/49_07.png differ diff --git a/imgs/icons/50_03.png b/imgs/icons/50_03.png index 1717b2d19..0ef7aea67 100644 Binary files a/imgs/icons/50_03.png and b/imgs/icons/50_03.png differ diff --git a/imgs/icons/50_11.png b/imgs/icons/50_11.png index f8a410836..1be51b145 100644 Binary files a/imgs/icons/50_11.png and b/imgs/icons/50_11.png differ diff --git a/imgs/icons/51_05.png b/imgs/icons/51_05.png deleted file mode 100644 index 5f211713e..000000000 Binary files a/imgs/icons/51_05.png and /dev/null differ diff --git a/imgs/icons/51_10.png b/imgs/icons/51_10.png deleted file mode 100644 index 20ebbff40..000000000 Binary files a/imgs/icons/51_10.png and /dev/null differ diff --git a/imgs/icons/51_11.png b/imgs/icons/51_11.png deleted file mode 100644 index e9e95b19a..000000000 Binary files a/imgs/icons/51_11.png and /dev/null differ diff --git a/imgs/icons/51_12.png b/imgs/icons/51_12.png deleted file mode 100644 index 59f5f1007..000000000 Binary files a/imgs/icons/51_12.png and /dev/null differ diff --git a/imgs/icons/51_13.png b/imgs/icons/51_13.png deleted file mode 100644 index 82be4e3ca..000000000 Binary files a/imgs/icons/51_13.png and /dev/null differ diff --git a/imgs/icons/51_14.png b/imgs/icons/51_14.png deleted file mode 100644 index f5b406f78..000000000 Binary files a/imgs/icons/51_14.png and /dev/null differ diff --git a/imgs/icons/51_15.png b/imgs/icons/51_15.png deleted file mode 100644 index 576c11bf7..000000000 Binary files a/imgs/icons/51_15.png and /dev/null differ diff --git a/imgs/icons/51_16.png b/imgs/icons/51_16.png deleted file mode 100644 index 6d80e7081..000000000 Binary files a/imgs/icons/51_16.png and /dev/null differ diff --git a/imgs/icons/52_01.png b/imgs/icons/52_01.png index 63997ef9a..e38478aba 100644 Binary files a/imgs/icons/52_01.png and b/imgs/icons/52_01.png differ diff --git a/imgs/icons/52_02.png b/imgs/icons/52_02.png index cb06d7db6..4ee9df2c2 100644 Binary files a/imgs/icons/52_02.png and b/imgs/icons/52_02.png differ diff --git a/imgs/icons/52_03.png b/imgs/icons/52_03.png index 6d7a4db03..1acbe9082 100644 Binary files a/imgs/icons/52_03.png and b/imgs/icons/52_03.png differ diff --git a/imgs/icons/52_04.png b/imgs/icons/52_04.png index 459a738b3..c6cab7c10 100644 Binary files a/imgs/icons/52_04.png and b/imgs/icons/52_04.png differ diff --git a/imgs/icons/52_05.png b/imgs/icons/52_05.png index 32f445063..62950a2c5 100644 Binary files a/imgs/icons/52_05.png and b/imgs/icons/52_05.png differ diff --git a/imgs/icons/52_06.png b/imgs/icons/52_06.png index 29c1a477f..c25b72b26 100644 Binary files a/imgs/icons/52_06.png and b/imgs/icons/52_06.png differ diff --git a/imgs/icons/52_07.png b/imgs/icons/52_07.png index e54ab6778..9d2f070f1 100644 Binary files a/imgs/icons/52_07.png and b/imgs/icons/52_07.png differ diff --git a/imgs/icons/52_08.png b/imgs/icons/52_08.png index 5f1469da1..a97324447 100644 Binary files a/imgs/icons/52_08.png and b/imgs/icons/52_08.png differ diff --git a/imgs/icons/52_10.png b/imgs/icons/52_10.png index 4ca5e77f5..bf74669ab 100644 Binary files a/imgs/icons/52_10.png and b/imgs/icons/52_10.png differ diff --git a/imgs/icons/52_11.png b/imgs/icons/52_11.png index 738736e6b..b9a0e4d47 100644 Binary files a/imgs/icons/52_11.png and b/imgs/icons/52_11.png differ diff --git a/imgs/icons/52_12.png b/imgs/icons/52_12.png index 02d05199b..caeafa3e0 100644 Binary files a/imgs/icons/52_12.png and b/imgs/icons/52_12.png differ diff --git a/imgs/icons/52_13.png b/imgs/icons/52_13.png index 179819806..05c7c82d9 100644 Binary files a/imgs/icons/52_13.png and b/imgs/icons/52_13.png differ diff --git a/imgs/icons/52_14.png b/imgs/icons/52_14.png index b5822283b..4b96de0f9 100644 Binary files a/imgs/icons/52_14.png and b/imgs/icons/52_14.png differ diff --git a/imgs/icons/52_15.png b/imgs/icons/52_15.png index 59f0721da..89806420f 100644 Binary files a/imgs/icons/52_15.png and b/imgs/icons/52_15.png differ diff --git a/imgs/icons/52_16.png b/imgs/icons/52_16.png index 2f165c61f..e1899bdcd 100644 Binary files a/imgs/icons/52_16.png and b/imgs/icons/52_16.png differ diff --git a/imgs/icons/53_01.png b/imgs/icons/53_01.png index d94d1c956..41c3be6cb 100644 Binary files a/imgs/icons/53_01.png and b/imgs/icons/53_01.png differ diff --git a/imgs/icons/53_02.png b/imgs/icons/53_02.png index ad6dc0823..96ebb6f5b 100644 Binary files a/imgs/icons/53_02.png and b/imgs/icons/53_02.png differ diff --git a/imgs/icons/53_03.png b/imgs/icons/53_03.png index 64438f7d5..b6f3980c2 100644 Binary files a/imgs/icons/53_03.png and b/imgs/icons/53_03.png differ diff --git a/imgs/icons/53_04.png b/imgs/icons/53_04.png index 5657f4464..0a5dd43a5 100644 Binary files a/imgs/icons/53_04.png and b/imgs/icons/53_04.png differ diff --git a/imgs/icons/53_05.png b/imgs/icons/53_05.png index 4968233c4..a426c73a0 100644 Binary files a/imgs/icons/53_05.png and b/imgs/icons/53_05.png differ diff --git a/imgs/icons/53_06.png b/imgs/icons/53_06.png index 565a6c19f..1318db66b 100644 Binary files a/imgs/icons/53_06.png and b/imgs/icons/53_06.png differ diff --git a/imgs/icons/53_07.png b/imgs/icons/53_07.png index 6d31007fb..4a112ecc5 100644 Binary files a/imgs/icons/53_07.png and b/imgs/icons/53_07.png differ diff --git a/imgs/icons/53_08.png b/imgs/icons/53_08.png index 8026efd48..e951a5842 100644 Binary files a/imgs/icons/53_08.png and b/imgs/icons/53_08.png differ diff --git a/imgs/icons/53_09.png b/imgs/icons/53_09.png index 6996aae4c..499e735d3 100644 Binary files a/imgs/icons/53_09.png and b/imgs/icons/53_09.png differ diff --git a/imgs/icons/53_14.png b/imgs/icons/53_14.png index b1bf0e1f1..16978c24a 100644 Binary files a/imgs/icons/53_14.png and b/imgs/icons/53_14.png differ diff --git a/imgs/icons/53_15.png b/imgs/icons/53_15.png index 9b617201d..9d2cefe6c 100644 Binary files a/imgs/icons/53_15.png and b/imgs/icons/53_15.png differ diff --git a/imgs/icons/53_16.png b/imgs/icons/53_16.png index 1ec59a4b5..0d8d74510 100644 Binary files a/imgs/icons/53_16.png and b/imgs/icons/53_16.png differ diff --git a/imgs/icons/53_64_16.png b/imgs/icons/53_64_16.png index bd0011937..0d8d74510 100644 Binary files a/imgs/icons/53_64_16.png and b/imgs/icons/53_64_16.png differ diff --git a/imgs/icons/55_13.png b/imgs/icons/55_13.png index 615a5c0b8..8a6643cc2 100644 Binary files a/imgs/icons/55_13.png and b/imgs/icons/55_13.png differ diff --git a/imgs/icons/56_01.png b/imgs/icons/56_01.png index fbd562c73..db4477981 100644 Binary files a/imgs/icons/56_01.png and b/imgs/icons/56_01.png differ diff --git a/imgs/icons/56_02.png b/imgs/icons/56_02.png index 125958dec..b31ce89c0 100644 Binary files a/imgs/icons/56_02.png and b/imgs/icons/56_02.png differ diff --git a/imgs/icons/56_03.png b/imgs/icons/56_03.png index 66a615302..3697a3231 100644 Binary files a/imgs/icons/56_03.png and b/imgs/icons/56_03.png differ diff --git a/imgs/icons/56_04.png b/imgs/icons/56_04.png index 3eb08b5ba..d13597923 100644 Binary files a/imgs/icons/56_04.png and b/imgs/icons/56_04.png differ diff --git a/imgs/icons/56_05.png b/imgs/icons/56_05.png index 0559cd72c..67e23d5af 100644 Binary files a/imgs/icons/56_05.png and b/imgs/icons/56_05.png differ diff --git a/imgs/icons/56_06.png b/imgs/icons/56_06.png index 7560ad3ea..8aba8ffb7 100644 Binary files a/imgs/icons/56_06.png and b/imgs/icons/56_06.png differ diff --git a/imgs/icons/56_07.png b/imgs/icons/56_07.png index c403b593b..51a90e1c5 100644 Binary files a/imgs/icons/56_07.png and b/imgs/icons/56_07.png differ diff --git a/imgs/icons/56_08.png b/imgs/icons/56_08.png index f13a31186..9fc97a843 100644 Binary files a/imgs/icons/56_08.png and b/imgs/icons/56_08.png differ diff --git a/imgs/icons/57_04.png b/imgs/icons/57_04.png index 66b15839c..52dba23c1 100644 Binary files a/imgs/icons/57_04.png and b/imgs/icons/57_04.png differ diff --git a/imgs/icons/62_01.png b/imgs/icons/62_01.png index 4ffe26e9b..149fc2ac1 100644 Binary files a/imgs/icons/62_01.png and b/imgs/icons/62_01.png differ diff --git a/imgs/icons/62_02.png b/imgs/icons/62_02.png index 299a4ccb8..b1fc19b28 100644 Binary files a/imgs/icons/62_02.png and b/imgs/icons/62_02.png differ diff --git a/imgs/icons/62_03.png b/imgs/icons/62_03.png index 04356a730..cc7d5192c 100644 Binary files a/imgs/icons/62_03.png and b/imgs/icons/62_03.png differ diff --git a/imgs/icons/62_04.png b/imgs/icons/62_04.png index c0dc28124..24b08e1e5 100644 Binary files a/imgs/icons/62_04.png and b/imgs/icons/62_04.png differ diff --git a/imgs/icons/62_05.png b/imgs/icons/62_05.png index c3c12250f..49d85c7a9 100644 Binary files a/imgs/icons/62_05.png and b/imgs/icons/62_05.png differ diff --git a/imgs/icons/62_06.png b/imgs/icons/62_06.png index 24b30c42b..697da9b5d 100644 Binary files a/imgs/icons/62_06.png and b/imgs/icons/62_06.png differ diff --git a/imgs/icons/62_07.png b/imgs/icons/62_07.png index e33137a8f..82664f191 100644 Binary files a/imgs/icons/62_07.png and b/imgs/icons/62_07.png differ diff --git a/imgs/icons/62_08.png b/imgs/icons/62_08.png index 2ca1cf196..ad54a4d45 100644 Binary files a/imgs/icons/62_08.png and b/imgs/icons/62_08.png differ diff --git a/imgs/icons/63_13.png b/imgs/icons/63_13.png index 11310df21..61293f3c2 100644 Binary files a/imgs/icons/63_13.png and b/imgs/icons/63_13.png differ diff --git a/imgs/icons/63_14.png b/imgs/icons/63_14.png index b47f3b3b6..1a1543f24 100644 Binary files a/imgs/icons/63_14.png and b/imgs/icons/63_14.png differ diff --git a/imgs/icons/63_15.png b/imgs/icons/63_15.png index afab19ca4..f48506a92 100644 Binary files a/imgs/icons/63_15.png and b/imgs/icons/63_15.png differ diff --git a/imgs/icons/63_16.png b/imgs/icons/63_16.png index c745b2cfd..a3df80018 100644 Binary files a/imgs/icons/63_16.png and b/imgs/icons/63_16.png differ diff --git a/imgs/icons/64_05.png b/imgs/icons/64_05.png index 0cf5134dc..b0a96b97e 100644 Binary files a/imgs/icons/64_05.png and b/imgs/icons/64_05.png differ diff --git a/imgs/icons/64_06.png b/imgs/icons/64_06.png index ca27a43c5..0e0b30c0d 100644 Binary files a/imgs/icons/64_06.png and b/imgs/icons/64_06.png differ diff --git a/imgs/icons/64_07.png b/imgs/icons/64_07.png index be65f0904..3d2eeae3c 100644 Binary files a/imgs/icons/64_07.png and b/imgs/icons/64_07.png differ diff --git a/imgs/icons/64_08.png b/imgs/icons/64_08.png index d7ee6295f..508face64 100644 Binary files a/imgs/icons/64_08.png and b/imgs/icons/64_08.png differ diff --git a/imgs/icons/64_11.png b/imgs/icons/64_11.png index c263086ec..66f522e19 100644 Binary files a/imgs/icons/64_11.png and b/imgs/icons/64_11.png differ diff --git a/imgs/icons/64_12.png b/imgs/icons/64_12.png index 23f6b5b70..b1afaf334 100644 Binary files a/imgs/icons/64_12.png and b/imgs/icons/64_12.png differ diff --git a/imgs/icons/68_01.png b/imgs/icons/68_01.png index c51466727..4cc4a67cd 100644 Binary files a/imgs/icons/68_01.png and b/imgs/icons/68_01.png differ diff --git a/imgs/icons/68_02.png b/imgs/icons/68_02.png index 33d0c75b5..b1d12db9b 100644 Binary files a/imgs/icons/68_02.png and b/imgs/icons/68_02.png differ diff --git a/imgs/icons/68_03.png b/imgs/icons/68_03.png index 006f9b149..9623df7d2 100644 Binary files a/imgs/icons/68_03.png and b/imgs/icons/68_03.png differ diff --git a/imgs/icons/68_04.png b/imgs/icons/68_04.png index 125fda065..84dc423a7 100644 Binary files a/imgs/icons/68_04.png and b/imgs/icons/68_04.png differ diff --git a/imgs/icons/68_09.png b/imgs/icons/68_09.png index cfa6ccfee..ae7b291a0 100644 Binary files a/imgs/icons/68_09.png and b/imgs/icons/68_09.png differ diff --git a/imgs/icons/68_10.png b/imgs/icons/68_10.png index 62abbe105..805dd11ef 100644 Binary files a/imgs/icons/68_10.png and b/imgs/icons/68_10.png differ diff --git a/imgs/icons/68_11.png b/imgs/icons/68_11.png index e0964982f..29f5cc5a6 100644 Binary files a/imgs/icons/68_11.png and b/imgs/icons/68_11.png differ diff --git a/imgs/icons/68_12.png b/imgs/icons/68_12.png index f0f887bd9..c2c69fe6a 100644 Binary files a/imgs/icons/68_12.png and b/imgs/icons/68_12.png differ diff --git a/imgs/icons/68_13.png b/imgs/icons/68_13.png index 52dbfcabf..eec2f210c 100644 Binary files a/imgs/icons/68_13.png and b/imgs/icons/68_13.png differ diff --git a/imgs/icons/68_14.png b/imgs/icons/68_14.png index 992728717..cd43275a8 100644 Binary files a/imgs/icons/68_14.png and b/imgs/icons/68_14.png differ diff --git a/imgs/icons/68_15.png b/imgs/icons/68_15.png index 5caaba76d..2d7c7cf1f 100644 Binary files a/imgs/icons/68_15.png and b/imgs/icons/68_15.png differ diff --git a/imgs/icons/68_16.png b/imgs/icons/68_16.png index 69d1e9707..584483c40 100644 Binary files a/imgs/icons/68_16.png and b/imgs/icons/68_16.png differ diff --git a/imgs/icons/70_03.png b/imgs/icons/70_03.png index f3fb81fda..2153130f4 100644 Binary files a/imgs/icons/70_03.png and b/imgs/icons/70_03.png differ diff --git a/imgs/icons/70_04.png b/imgs/icons/70_04.png index b065a4989..d2f471497 100644 Binary files a/imgs/icons/70_04.png and b/imgs/icons/70_04.png differ diff --git a/imgs/icons/70_05.png b/imgs/icons/70_05.png index cdbea3d4b..e66e0e937 100644 Binary files a/imgs/icons/70_05.png and b/imgs/icons/70_05.png differ diff --git a/imgs/icons/70_06.png b/imgs/icons/70_06.png index 9ca126348..ca2c6ca67 100644 Binary files a/imgs/icons/70_06.png and b/imgs/icons/70_06.png differ diff --git a/imgs/icons/70_07.png b/imgs/icons/70_07.png index b80c6bcd1..d03d0f46f 100644 Binary files a/imgs/icons/70_07.png and b/imgs/icons/70_07.png differ diff --git a/imgs/icons/70_08.png b/imgs/icons/70_08.png index c2a490c47..d746511a4 100644 Binary files a/imgs/icons/70_08.png and b/imgs/icons/70_08.png differ diff --git a/imgs/icons/70_09.png b/imgs/icons/70_09.png index 6b67b45ef..090145b3e 100644 Binary files a/imgs/icons/70_09.png and b/imgs/icons/70_09.png differ diff --git a/imgs/icons/70_10.png b/imgs/icons/70_10.png index 477ff9a9a..6a5385ff2 100644 Binary files a/imgs/icons/70_10.png and b/imgs/icons/70_10.png differ diff --git a/imgs/icons/70_12.png b/imgs/icons/70_12.png index 410ee6cbb..295538a9f 100644 Binary files a/imgs/icons/70_12.png and b/imgs/icons/70_12.png differ diff --git a/imgs/icons/74_01.png b/imgs/icons/74_01.png index b453dd0ae..08dceaefa 100644 Binary files a/imgs/icons/74_01.png and b/imgs/icons/74_01.png differ diff --git a/imgs/icons/74_02.png b/imgs/icons/74_02.png index 54ba13045..7ef287a9e 100644 Binary files a/imgs/icons/74_02.png and b/imgs/icons/74_02.png differ diff --git a/imgs/icons/74_03.png b/imgs/icons/74_03.png index 39b8bf90d..73976dded 100644 Binary files a/imgs/icons/74_03.png and b/imgs/icons/74_03.png differ diff --git a/imgs/icons/74_04.png b/imgs/icons/74_04.png index 48d7a29f4..9962b9b8d 100644 Binary files a/imgs/icons/74_04.png and b/imgs/icons/74_04.png differ diff --git a/imgs/icons/74_05.png b/imgs/icons/74_05.png index 3d50490cb..8b4471428 100644 Binary files a/imgs/icons/74_05.png and b/imgs/icons/74_05.png differ diff --git a/imgs/icons/74_06.png b/imgs/icons/74_06.png index 3ec2556e1..3388d0608 100644 Binary files a/imgs/icons/74_06.png and b/imgs/icons/74_06.png differ diff --git a/imgs/icons/74_07.png b/imgs/icons/74_07.png index b01f222bf..f44fc9e32 100644 Binary files a/imgs/icons/74_07.png and b/imgs/icons/74_07.png differ diff --git a/imgs/icons/74_08.png b/imgs/icons/74_08.png index 0ea078978..17d3e858d 100644 Binary files a/imgs/icons/74_08.png and b/imgs/icons/74_08.png differ diff --git a/imgs/icons/74_09.png b/imgs/icons/74_09.png index 85b18ae99..7a68a1fbb 100644 Binary files a/imgs/icons/74_09.png and b/imgs/icons/74_09.png differ diff --git a/imgs/icons/74_10.png b/imgs/icons/74_10.png index b9a4754bb..7aee58575 100644 Binary files a/imgs/icons/74_10.png and b/imgs/icons/74_10.png differ diff --git a/imgs/icons/76_01.png b/imgs/icons/76_01.png index 32c79f83d..71d1b9fe5 100644 Binary files a/imgs/icons/76_01.png and b/imgs/icons/76_01.png differ diff --git a/imgs/icons/76_04.png b/imgs/icons/76_04.png index 2f9e14b4d..67c4cb3c7 100644 Binary files a/imgs/icons/76_04.png and b/imgs/icons/76_04.png differ diff --git a/imgs/icons/76_05.png b/imgs/icons/76_05.png index 89a6be139..fdb2783ff 100644 Binary files a/imgs/icons/76_05.png and b/imgs/icons/76_05.png differ diff --git a/imgs/icons/76_06.png b/imgs/icons/76_06.png index 9fcc91b9e..b82cf68d6 100644 Binary files a/imgs/icons/76_06.png and b/imgs/icons/76_06.png differ diff --git a/imgs/icons/76_07.png b/imgs/icons/76_07.png index 5646a17ca..c2baf29f5 100644 Binary files a/imgs/icons/76_07.png and b/imgs/icons/76_07.png differ diff --git a/imgs/icons/76_08.png b/imgs/icons/76_08.png index 882c4822b..ffd4ef1ee 100644 Binary files a/imgs/icons/76_08.png and b/imgs/icons/76_08.png differ diff --git a/imgs/icons/76_09.png b/imgs/icons/76_09.png index 4987f64b5..2233095e1 100644 Binary files a/imgs/icons/76_09.png and b/imgs/icons/76_09.png differ diff --git a/imgs/icons/76_16.png b/imgs/icons/76_16.png index 07e248823..0e19cdd50 100644 Binary files a/imgs/icons/76_16.png and b/imgs/icons/76_16.png differ diff --git a/imgs/icons/79_09.png b/imgs/icons/79_09.png index d4c345f51..993fd6f30 100644 Binary files a/imgs/icons/79_09.png and b/imgs/icons/79_09.png differ diff --git a/imgs/icons/89_1.png b/imgs/icons/89_1.png index d67cec722..b0a29d271 100644 Binary files a/imgs/icons/89_1.png and b/imgs/icons/89_1.png differ diff --git a/imgs/icons/89_2.png b/imgs/icons/89_2.png index 897572f90..58f9800e5 100644 Binary files a/imgs/icons/89_2.png and b/imgs/icons/89_2.png differ diff --git a/imgs/icons/89_3.png b/imgs/icons/89_3.png index 486cbfcd5..d392fc2de 100644 Binary files a/imgs/icons/89_3.png and b/imgs/icons/89_3.png differ diff --git a/imgs/icons/89_4.png b/imgs/icons/89_4.png index 03539d4bf..2b7790645 100644 Binary files a/imgs/icons/89_4.png and b/imgs/icons/89_4.png differ diff --git a/imgs/icons/94_64_9.png b/imgs/icons/94_64_9.png index 0eb00b510..fdcec1e33 100644 Binary files a/imgs/icons/94_64_9.png and b/imgs/icons/94_64_9.png differ diff --git a/imgs/icons/95_05.png b/imgs/icons/95_05.png index b24ce8138..0f79176f4 100644 Binary files a/imgs/icons/95_05.png and b/imgs/icons/95_05.png differ diff --git a/imgs/icons/99_09.png b/imgs/icons/99_09.png index df6362c16..e256bf5e9 100644 Binary files a/imgs/icons/99_09.png and b/imgs/icons/99_09.png differ diff --git a/imgs/icons/Icon_64px_Fireworks.png b/imgs/icons/Icon_64px_Fireworks.png deleted file mode 100644 index 2e8a27c3d..000000000 Binary files a/imgs/icons/Icon_64px_Fireworks.png and /dev/null differ diff --git a/imgs/icons/MarketIcon_16px_Amarr.png b/imgs/icons/MarketIcon_16px_Amarr.png deleted file mode 100644 index fdb721f65..000000000 Binary files a/imgs/icons/MarketIcon_16px_Amarr.png and /dev/null differ diff --git a/imgs/icons/MarketIcon_16px_Caldari.png b/imgs/icons/MarketIcon_16px_Caldari.png deleted file mode 100644 index edd49286e..000000000 Binary files a/imgs/icons/MarketIcon_16px_Caldari.png and /dev/null differ diff --git a/imgs/icons/MarketIcon_16px_Gallente.png b/imgs/icons/MarketIcon_16px_Gallente.png deleted file mode 100644 index 4039ba05c..000000000 Binary files a/imgs/icons/MarketIcon_16px_Gallente.png and /dev/null differ diff --git a/imgs/icons/MarketIcon_16px_Minmatar.png b/imgs/icons/MarketIcon_16px_Minmatar.png deleted file mode 100644 index dba4a2726..000000000 Binary files a/imgs/icons/MarketIcon_16px_Minmatar.png and /dev/null differ diff --git a/imgs/renders/10254.png b/imgs/renders/10254.png deleted file mode 100644 index 4b9ec73c0..000000000 Binary files a/imgs/renders/10254.png and /dev/null differ diff --git a/imgs/renders/11011.png b/imgs/renders/11011.png index aed8b78b8..43f603822 100644 Binary files a/imgs/renders/11011.png and b/imgs/renders/11011.png differ diff --git a/imgs/renders/11019.png b/imgs/renders/11019.png deleted file mode 100644 index 199106bca..000000000 Binary files a/imgs/renders/11019.png and /dev/null differ diff --git a/imgs/renders/11129.png b/imgs/renders/11129.png index 39f0adcad..e61896246 100644 Binary files a/imgs/renders/11129.png and b/imgs/renders/11129.png differ diff --git a/imgs/renders/11132.png b/imgs/renders/11132.png index e308b9d22..ddf54b1ee 100644 Binary files a/imgs/renders/11132.png and b/imgs/renders/11132.png differ diff --git a/imgs/renders/11134.png b/imgs/renders/11134.png index adb82d599..bb8f8b418 100644 Binary files a/imgs/renders/11134.png and b/imgs/renders/11134.png differ diff --git a/imgs/renders/11172.png b/imgs/renders/11172.png index 829609925..5e5c2e88d 100644 Binary files a/imgs/renders/11172.png and b/imgs/renders/11172.png differ diff --git a/imgs/renders/11174.png b/imgs/renders/11174.png index 5f350acd2..d0ecdc900 100644 Binary files a/imgs/renders/11174.png and b/imgs/renders/11174.png differ diff --git a/imgs/renders/11176.png b/imgs/renders/11176.png index e340c1068..ef3e002e6 100644 Binary files a/imgs/renders/11176.png and b/imgs/renders/11176.png differ diff --git a/imgs/renders/11178.png b/imgs/renders/11178.png index b0f0eb44c..03bff6e3c 100644 Binary files a/imgs/renders/11178.png and b/imgs/renders/11178.png differ diff --git a/imgs/renders/11180.png b/imgs/renders/11180.png deleted file mode 100644 index 8532c4682..000000000 Binary files a/imgs/renders/11180.png and /dev/null differ diff --git a/imgs/renders/11182.png b/imgs/renders/11182.png index bf8fe832f..38685248e 100644 Binary files a/imgs/renders/11182.png and b/imgs/renders/11182.png differ diff --git a/imgs/renders/11184.png b/imgs/renders/11184.png index a94051f39..6bed254be 100644 Binary files a/imgs/renders/11184.png and b/imgs/renders/11184.png differ diff --git a/imgs/renders/11186.png b/imgs/renders/11186.png index ff7c52502..e8f75b15b 100644 Binary files a/imgs/renders/11186.png and b/imgs/renders/11186.png differ diff --git a/imgs/renders/11188.png b/imgs/renders/11188.png index 8b347d4db..92a56d3e0 100644 Binary files a/imgs/renders/11188.png and b/imgs/renders/11188.png differ diff --git a/imgs/renders/11190.png b/imgs/renders/11190.png index eaeab53f9..cdaf79494 100644 Binary files a/imgs/renders/11190.png and b/imgs/renders/11190.png differ diff --git a/imgs/renders/11192.png b/imgs/renders/11192.png index 674ee4dc0..76174e5cc 100644 Binary files a/imgs/renders/11192.png and b/imgs/renders/11192.png differ diff --git a/imgs/renders/11194.png b/imgs/renders/11194.png index 8f9788ead..ee31b2b47 100644 Binary files a/imgs/renders/11194.png and b/imgs/renders/11194.png differ diff --git a/imgs/renders/11196.png b/imgs/renders/11196.png index 05d77e742..669de8269 100644 Binary files a/imgs/renders/11196.png and b/imgs/renders/11196.png differ diff --git a/imgs/renders/11198.png b/imgs/renders/11198.png index c4d0e8279..731935b84 100644 Binary files a/imgs/renders/11198.png and b/imgs/renders/11198.png differ diff --git a/imgs/renders/11200.png b/imgs/renders/11200.png index 0e4cc3455..757a2107f 100644 Binary files a/imgs/renders/11200.png and b/imgs/renders/11200.png differ diff --git a/imgs/renders/11202.png b/imgs/renders/11202.png index 8d7625dc2..9f4f879ed 100644 Binary files a/imgs/renders/11202.png and b/imgs/renders/11202.png differ diff --git a/imgs/renders/11365.png b/imgs/renders/11365.png index 0ca250105..680d5a513 100644 Binary files a/imgs/renders/11365.png and b/imgs/renders/11365.png differ diff --git a/imgs/renders/11371.png b/imgs/renders/11371.png index cbd9f19c5..432961bcd 100644 Binary files a/imgs/renders/11371.png and b/imgs/renders/11371.png differ diff --git a/imgs/renders/11373.png b/imgs/renders/11373.png deleted file mode 100644 index 0e7ab40cb..000000000 Binary files a/imgs/renders/11373.png and /dev/null differ diff --git a/imgs/renders/11375.png b/imgs/renders/11375.png deleted file mode 100644 index a4b45701f..000000000 Binary files a/imgs/renders/11375.png and /dev/null differ diff --git a/imgs/renders/11377.png b/imgs/renders/11377.png index 64d447f0f..ff3e2793d 100644 Binary files a/imgs/renders/11377.png and b/imgs/renders/11377.png differ diff --git a/imgs/renders/11379.png b/imgs/renders/11379.png index a8521af08..5a31c2abf 100644 Binary files a/imgs/renders/11379.png and b/imgs/renders/11379.png differ diff --git a/imgs/renders/11381.png b/imgs/renders/11381.png index ed151b9ce..964281297 100644 Binary files a/imgs/renders/11381.png and b/imgs/renders/11381.png differ diff --git a/imgs/renders/11383.png b/imgs/renders/11383.png deleted file mode 100644 index 2fafefbbf..000000000 Binary files a/imgs/renders/11383.png and /dev/null differ diff --git a/imgs/renders/11385.png b/imgs/renders/11385.png deleted file mode 100644 index a516ab624..000000000 Binary files a/imgs/renders/11385.png and /dev/null differ diff --git a/imgs/renders/11387.png b/imgs/renders/11387.png index 17f2e0168..086292471 100644 Binary files a/imgs/renders/11387.png and b/imgs/renders/11387.png differ diff --git a/imgs/renders/11389.png b/imgs/renders/11389.png deleted file mode 100644 index eedfbae4e..000000000 Binary files a/imgs/renders/11389.png and /dev/null differ diff --git a/imgs/renders/11393.png b/imgs/renders/11393.png index 29f0875f1..3c7463e65 100644 Binary files a/imgs/renders/11393.png and b/imgs/renders/11393.png differ diff --git a/imgs/renders/11400.png b/imgs/renders/11400.png index c3736d206..c4b62b635 100644 Binary files a/imgs/renders/11400.png and b/imgs/renders/11400.png differ diff --git a/imgs/renders/11567.png b/imgs/renders/11567.png index 7210fdb29..3afae72a4 100644 Binary files a/imgs/renders/11567.png and b/imgs/renders/11567.png differ diff --git a/imgs/renders/11591.png b/imgs/renders/11591.png deleted file mode 100644 index f174e7a92..000000000 Binary files a/imgs/renders/11591.png and /dev/null differ diff --git a/imgs/renders/11936.png b/imgs/renders/11936.png index 9c20c4ead..b9ddb0338 100644 Binary files a/imgs/renders/11936.png and b/imgs/renders/11936.png differ diff --git a/imgs/renders/11938.png b/imgs/renders/11938.png index de9ce0ab0..bf209e75a 100644 Binary files a/imgs/renders/11938.png and b/imgs/renders/11938.png differ diff --git a/imgs/renders/11940.png b/imgs/renders/11940.png index b0e16c4f3..611f2ea7e 100644 Binary files a/imgs/renders/11940.png and b/imgs/renders/11940.png differ diff --git a/imgs/renders/11942.png b/imgs/renders/11942.png index 25ad048ae..4b25c3af1 100644 Binary files a/imgs/renders/11942.png and b/imgs/renders/11942.png differ diff --git a/imgs/renders/11957.png b/imgs/renders/11957.png index d8518d7da..20115952a 100644 Binary files a/imgs/renders/11957.png and b/imgs/renders/11957.png differ diff --git a/imgs/renders/11959.png b/imgs/renders/11959.png index 120a3deb9..46d9d95ea 100644 Binary files a/imgs/renders/11959.png and b/imgs/renders/11959.png differ diff --git a/imgs/renders/11961.png b/imgs/renders/11961.png index dd2f214e8..79a87aa70 100644 Binary files a/imgs/renders/11961.png and b/imgs/renders/11961.png differ diff --git a/imgs/renders/11963.png b/imgs/renders/11963.png index 5d708df8b..efa20706b 100644 Binary files a/imgs/renders/11963.png and b/imgs/renders/11963.png differ diff --git a/imgs/renders/11965.png b/imgs/renders/11965.png index d57b1cb67..1b719e5e7 100644 Binary files a/imgs/renders/11965.png and b/imgs/renders/11965.png differ diff --git a/imgs/renders/11969.png b/imgs/renders/11969.png index f80f1e574..0e3ab23cc 100644 Binary files a/imgs/renders/11969.png and b/imgs/renders/11969.png differ diff --git a/imgs/renders/11971.png b/imgs/renders/11971.png index d602e06db..f67c09933 100644 Binary files a/imgs/renders/11971.png and b/imgs/renders/11971.png differ diff --git a/imgs/renders/11973.png b/imgs/renders/11973.png deleted file mode 100644 index 4446dc48e..000000000 Binary files a/imgs/renders/11973.png and /dev/null differ diff --git a/imgs/renders/11978.png b/imgs/renders/11978.png index 851a8bbeb..c8b821365 100644 Binary files a/imgs/renders/11978.png and b/imgs/renders/11978.png differ diff --git a/imgs/renders/11980.png b/imgs/renders/11980.png deleted file mode 100644 index 927039197..000000000 Binary files a/imgs/renders/11980.png and /dev/null differ diff --git a/imgs/renders/11982.png b/imgs/renders/11982.png deleted file mode 100644 index 78454722f..000000000 Binary files a/imgs/renders/11982.png and /dev/null differ diff --git a/imgs/renders/11985.png b/imgs/renders/11985.png index f185b78d4..4eee6f035 100644 Binary files a/imgs/renders/11985.png and b/imgs/renders/11985.png differ diff --git a/imgs/renders/11987.png b/imgs/renders/11987.png index 266c57e49..82604748e 100644 Binary files a/imgs/renders/11987.png and b/imgs/renders/11987.png differ diff --git a/imgs/renders/11989.png b/imgs/renders/11989.png index 971201ec4..6b983eb2d 100644 Binary files a/imgs/renders/11989.png and b/imgs/renders/11989.png differ diff --git a/imgs/renders/11991.png b/imgs/renders/11991.png deleted file mode 100644 index 22f78ce6e..000000000 Binary files a/imgs/renders/11991.png and /dev/null differ diff --git a/imgs/renders/11993.png b/imgs/renders/11993.png index 63d292a2a..77d765dd1 100644 Binary files a/imgs/renders/11993.png and b/imgs/renders/11993.png differ diff --git a/imgs/renders/11995.png b/imgs/renders/11995.png index f92a4383f..ff2f6fa30 100644 Binary files a/imgs/renders/11995.png and b/imgs/renders/11995.png differ diff --git a/imgs/renders/11997.png b/imgs/renders/11997.png deleted file mode 100644 index edc073ccc..000000000 Binary files a/imgs/renders/11997.png and /dev/null differ diff --git a/imgs/renders/11999.png b/imgs/renders/11999.png index f0fcd725b..4dc9a2922 100644 Binary files a/imgs/renders/11999.png and b/imgs/renders/11999.png differ diff --git a/imgs/renders/12003.png b/imgs/renders/12003.png index b7e755603..a9d1d13db 100644 Binary files a/imgs/renders/12003.png and b/imgs/renders/12003.png differ diff --git a/imgs/renders/12005.png b/imgs/renders/12005.png index 19beded43..ee62f7a0e 100644 Binary files a/imgs/renders/12005.png and b/imgs/renders/12005.png differ diff --git a/imgs/renders/12007.png b/imgs/renders/12007.png deleted file mode 100644 index 46a0d93f4..000000000 Binary files a/imgs/renders/12007.png and /dev/null differ diff --git a/imgs/renders/12009.png b/imgs/renders/12009.png deleted file mode 100644 index a8c90f71e..000000000 Binary files a/imgs/renders/12009.png and /dev/null differ diff --git a/imgs/renders/12011.png b/imgs/renders/12011.png index d26a22f33..a98fb65eb 100644 Binary files a/imgs/renders/12011.png and b/imgs/renders/12011.png differ diff --git a/imgs/renders/12013.png b/imgs/renders/12013.png index 2ed7ea7e3..6d35410fe 100644 Binary files a/imgs/renders/12013.png and b/imgs/renders/12013.png differ diff --git a/imgs/renders/12015.png b/imgs/renders/12015.png index 064cd2551..e3d859413 100644 Binary files a/imgs/renders/12015.png and b/imgs/renders/12015.png differ diff --git a/imgs/renders/12017.png b/imgs/renders/12017.png index b239b1460..fd1375e90 100644 Binary files a/imgs/renders/12017.png and b/imgs/renders/12017.png differ diff --git a/imgs/renders/12019.png b/imgs/renders/12019.png index 22fa65e7f..00e393ff8 100644 Binary files a/imgs/renders/12019.png and b/imgs/renders/12019.png differ diff --git a/imgs/renders/12021.png b/imgs/renders/12021.png index 7d1b318a9..b72b6c3f2 100644 Binary files a/imgs/renders/12021.png and b/imgs/renders/12021.png differ diff --git a/imgs/renders/12023.png b/imgs/renders/12023.png index 02c7b4669..ebeb8aaee 100644 Binary files a/imgs/renders/12023.png and b/imgs/renders/12023.png differ diff --git a/imgs/renders/12030.png b/imgs/renders/12030.png deleted file mode 100644 index cf75b3dac..000000000 Binary files a/imgs/renders/12030.png and /dev/null differ diff --git a/imgs/renders/12032.png b/imgs/renders/12032.png index d800398eb..4bd038a26 100644 Binary files a/imgs/renders/12032.png and b/imgs/renders/12032.png differ diff --git a/imgs/renders/12034.png b/imgs/renders/12034.png index 9a334dc6d..4a2a30d8b 100644 Binary files a/imgs/renders/12034.png and b/imgs/renders/12034.png differ diff --git a/imgs/renders/12036.png b/imgs/renders/12036.png deleted file mode 100644 index 6682629ad..000000000 Binary files a/imgs/renders/12036.png and /dev/null differ diff --git a/imgs/renders/12038.png b/imgs/renders/12038.png index b33de0aa6..25933035a 100644 Binary files a/imgs/renders/12038.png and b/imgs/renders/12038.png differ diff --git a/imgs/renders/12040.png b/imgs/renders/12040.png deleted file mode 100644 index f0f8578a1..000000000 Binary files a/imgs/renders/12040.png and /dev/null differ diff --git a/imgs/renders/12042.png b/imgs/renders/12042.png index 327cc470a..bf089ad01 100644 Binary files a/imgs/renders/12042.png and b/imgs/renders/12042.png differ diff --git a/imgs/renders/12044.png b/imgs/renders/12044.png index bba748dea..728d23d47 100644 Binary files a/imgs/renders/12044.png and b/imgs/renders/12044.png differ diff --git a/imgs/renders/1233.png b/imgs/renders/1233.png deleted file mode 100644 index 5571ab305..000000000 Binary files a/imgs/renders/1233.png and /dev/null differ diff --git a/imgs/renders/12403.png b/imgs/renders/12403.png deleted file mode 100644 index f73c1b861..000000000 Binary files a/imgs/renders/12403.png and /dev/null differ diff --git a/imgs/renders/12729.png b/imgs/renders/12729.png index dacd1ff55..a61153fbb 100644 Binary files a/imgs/renders/12729.png and b/imgs/renders/12729.png differ diff --git a/imgs/renders/12731.png b/imgs/renders/12731.png index b19260d1c..dff2c2cf5 100644 Binary files a/imgs/renders/12731.png and b/imgs/renders/12731.png differ diff --git a/imgs/renders/12733.png b/imgs/renders/12733.png index 97e73bae7..875263a31 100644 Binary files a/imgs/renders/12733.png and b/imgs/renders/12733.png differ diff --git a/imgs/renders/12735.png b/imgs/renders/12735.png index 96364a710..431390131 100644 Binary files a/imgs/renders/12735.png and b/imgs/renders/12735.png differ diff --git a/imgs/renders/12743.png b/imgs/renders/12743.png index 0e3cb73c4..a7d2d572f 100644 Binary files a/imgs/renders/12743.png and b/imgs/renders/12743.png differ diff --git a/imgs/renders/12745.png b/imgs/renders/12745.png index 1c0162e20..183c134eb 100644 Binary files a/imgs/renders/12745.png and b/imgs/renders/12745.png differ diff --git a/imgs/renders/12747.png b/imgs/renders/12747.png index 082fc70ca..47780e28d 100644 Binary files a/imgs/renders/12747.png and b/imgs/renders/12747.png differ diff --git a/imgs/renders/12753.png b/imgs/renders/12753.png index 68f28f2df..1dbfe679b 100644 Binary files a/imgs/renders/12753.png and b/imgs/renders/12753.png differ diff --git a/imgs/renders/13202.png b/imgs/renders/13202.png index bd956be55..0cb36beca 100644 Binary files a/imgs/renders/13202.png and b/imgs/renders/13202.png differ diff --git a/imgs/renders/16227.png b/imgs/renders/16227.png index 52a827ad2..4a8b68874 100644 Binary files a/imgs/renders/16227.png and b/imgs/renders/16227.png differ diff --git a/imgs/renders/16229.png b/imgs/renders/16229.png index 8537b5ed4..8f34313ab 100644 Binary files a/imgs/renders/16229.png and b/imgs/renders/16229.png differ diff --git a/imgs/renders/16231.png b/imgs/renders/16231.png index abefbefcf..ec96c2524 100644 Binary files a/imgs/renders/16231.png and b/imgs/renders/16231.png differ diff --git a/imgs/renders/16233.png b/imgs/renders/16233.png index d89611a99..0824197c1 100644 Binary files a/imgs/renders/16233.png and b/imgs/renders/16233.png differ diff --git a/imgs/renders/16236.png b/imgs/renders/16236.png index f137947e7..e2dc3ef37 100644 Binary files a/imgs/renders/16236.png and b/imgs/renders/16236.png differ diff --git a/imgs/renders/16238.png b/imgs/renders/16238.png index 27beb9d69..885beef26 100644 Binary files a/imgs/renders/16238.png and b/imgs/renders/16238.png differ diff --git a/imgs/renders/16240.png b/imgs/renders/16240.png index 643375439..61565d129 100644 Binary files a/imgs/renders/16240.png and b/imgs/renders/16240.png differ diff --git a/imgs/renders/16242.png b/imgs/renders/16242.png index 31a7676ef..807c78a39 100644 Binary files a/imgs/renders/16242.png and b/imgs/renders/16242.png differ diff --git a/imgs/renders/17360.png b/imgs/renders/17360.png deleted file mode 100644 index 27e275348..000000000 Binary files a/imgs/renders/17360.png and /dev/null differ diff --git a/imgs/renders/17476.png b/imgs/renders/17476.png index 22ad9a0dd..f71ab37be 100644 Binary files a/imgs/renders/17476.png and b/imgs/renders/17476.png differ diff --git a/imgs/renders/17478.png b/imgs/renders/17478.png index 1f80ed572..92f20b6ea 100644 Binary files a/imgs/renders/17478.png and b/imgs/renders/17478.png differ diff --git a/imgs/renders/17480.png b/imgs/renders/17480.png index 643f9b00d..b5d38deb4 100644 Binary files a/imgs/renders/17480.png and b/imgs/renders/17480.png differ diff --git a/imgs/renders/17619.png b/imgs/renders/17619.png index a3cf599bc..a1cf3a992 100644 Binary files a/imgs/renders/17619.png and b/imgs/renders/17619.png differ diff --git a/imgs/renders/17634.png b/imgs/renders/17634.png index 1e775e9e3..175f41be8 100644 Binary files a/imgs/renders/17634.png and b/imgs/renders/17634.png differ diff --git a/imgs/renders/17636.png b/imgs/renders/17636.png index f495bfdcb..2ba2b65f8 100644 Binary files a/imgs/renders/17636.png and b/imgs/renders/17636.png differ diff --git a/imgs/renders/17703.png b/imgs/renders/17703.png index 9721d40b6..9713d4594 100644 Binary files a/imgs/renders/17703.png and b/imgs/renders/17703.png differ diff --git a/imgs/renders/17705.png b/imgs/renders/17705.png deleted file mode 100644 index edaa2ca33..000000000 Binary files a/imgs/renders/17705.png and /dev/null differ diff --git a/imgs/renders/17707.png b/imgs/renders/17707.png deleted file mode 100644 index 9d7415698..000000000 Binary files a/imgs/renders/17707.png and /dev/null differ diff --git a/imgs/renders/17709.png b/imgs/renders/17709.png index b52de9801..a863c5ca6 100644 Binary files a/imgs/renders/17709.png and b/imgs/renders/17709.png differ diff --git a/imgs/renders/17711.png b/imgs/renders/17711.png deleted file mode 100644 index 069f476fd..000000000 Binary files a/imgs/renders/17711.png and /dev/null differ diff --git a/imgs/renders/17713.png b/imgs/renders/17713.png index 9780131a9..6997f8389 100644 Binary files a/imgs/renders/17713.png and b/imgs/renders/17713.png differ diff --git a/imgs/renders/17715.png b/imgs/renders/17715.png index 97197a14a..6892e2318 100644 Binary files a/imgs/renders/17715.png and b/imgs/renders/17715.png differ diff --git a/imgs/renders/17718.png b/imgs/renders/17718.png index 54e551920..3f4f8a7e3 100644 Binary files a/imgs/renders/17718.png and b/imgs/renders/17718.png differ diff --git a/imgs/renders/17720.png b/imgs/renders/17720.png index 6072b7d4d..6aa21b7d0 100644 Binary files a/imgs/renders/17720.png and b/imgs/renders/17720.png differ diff --git a/imgs/renders/17722.png b/imgs/renders/17722.png index 6830c650c..ef45cc709 100644 Binary files a/imgs/renders/17722.png and b/imgs/renders/17722.png differ diff --git a/imgs/renders/17724.png b/imgs/renders/17724.png deleted file mode 100644 index a7d2c030e..000000000 Binary files a/imgs/renders/17724.png and /dev/null differ diff --git a/imgs/renders/17726.png b/imgs/renders/17726.png index d9e0290e5..2cf4932c2 100644 Binary files a/imgs/renders/17726.png and b/imgs/renders/17726.png differ diff --git a/imgs/renders/17728.png b/imgs/renders/17728.png index bff78c72b..3b0c49399 100644 Binary files a/imgs/renders/17728.png and b/imgs/renders/17728.png differ diff --git a/imgs/renders/17730.png b/imgs/renders/17730.png deleted file mode 100644 index d6ecda179..000000000 Binary files a/imgs/renders/17730.png and /dev/null differ diff --git a/imgs/renders/17732.png b/imgs/renders/17732.png index a53ebf73f..dedc5483f 100644 Binary files a/imgs/renders/17732.png and b/imgs/renders/17732.png differ diff --git a/imgs/renders/17734.png b/imgs/renders/17734.png deleted file mode 100644 index a2908754e..000000000 Binary files a/imgs/renders/17734.png and /dev/null differ diff --git a/imgs/renders/17736.png b/imgs/renders/17736.png index 6342411ee..5f022ee08 100644 Binary files a/imgs/renders/17736.png and b/imgs/renders/17736.png differ diff --git a/imgs/renders/17738.png b/imgs/renders/17738.png index d69a14222..b0deb515c 100644 Binary files a/imgs/renders/17738.png and b/imgs/renders/17738.png differ diff --git a/imgs/renders/17740.png b/imgs/renders/17740.png index adf68ceca..2e88144b3 100644 Binary files a/imgs/renders/17740.png and b/imgs/renders/17740.png differ diff --git a/imgs/renders/17812.png b/imgs/renders/17812.png index 47de84467..7cc6847cc 100644 Binary files a/imgs/renders/17812.png and b/imgs/renders/17812.png differ diff --git a/imgs/renders/17841.png b/imgs/renders/17841.png index 79c2bed6e..6e45c0c7e 100644 Binary files a/imgs/renders/17841.png and b/imgs/renders/17841.png differ diff --git a/imgs/renders/17843.png b/imgs/renders/17843.png index f5ff0422d..97912d02e 100644 Binary files a/imgs/renders/17843.png and b/imgs/renders/17843.png differ diff --git a/imgs/renders/17918.png b/imgs/renders/17918.png index 6c5cd2d9f..ce7e07fdc 100644 Binary files a/imgs/renders/17918.png and b/imgs/renders/17918.png differ diff --git a/imgs/renders/17920.png b/imgs/renders/17920.png index 070048992..979afd242 100644 Binary files a/imgs/renders/17920.png and b/imgs/renders/17920.png differ diff --git a/imgs/renders/17922.png b/imgs/renders/17922.png index 91e5386ae..9019b8edc 100644 Binary files a/imgs/renders/17922.png and b/imgs/renders/17922.png differ diff --git a/imgs/renders/17924.png b/imgs/renders/17924.png index 1ed96294a..84e647803 100644 Binary files a/imgs/renders/17924.png and b/imgs/renders/17924.png differ diff --git a/imgs/renders/17926.png b/imgs/renders/17926.png index 997c3af60..44a45b729 100644 Binary files a/imgs/renders/17926.png and b/imgs/renders/17926.png differ diff --git a/imgs/renders/17928.png b/imgs/renders/17928.png index c2862e5af..b840c14ec 100644 Binary files a/imgs/renders/17928.png and b/imgs/renders/17928.png differ diff --git a/imgs/renders/17930.png b/imgs/renders/17930.png index ea9bb55e5..0d8ad8fb7 100644 Binary files a/imgs/renders/17930.png and b/imgs/renders/17930.png differ diff --git a/imgs/renders/17932.png b/imgs/renders/17932.png index 1ddd7aac8..9d001d0c1 100644 Binary files a/imgs/renders/17932.png and b/imgs/renders/17932.png differ diff --git a/imgs/renders/1896.png b/imgs/renders/1896.png deleted file mode 100644 index 56879985f..000000000 Binary files a/imgs/renders/1896.png and /dev/null differ diff --git a/imgs/renders/1898.png b/imgs/renders/1898.png deleted file mode 100644 index 8808a36ce..000000000 Binary files a/imgs/renders/1898.png and /dev/null differ diff --git a/imgs/renders/1900.png b/imgs/renders/1900.png deleted file mode 100644 index ad985fffd..000000000 Binary files a/imgs/renders/1900.png and /dev/null differ diff --git a/imgs/renders/1902.png b/imgs/renders/1902.png deleted file mode 100644 index 50ef3dd5a..000000000 Binary files a/imgs/renders/1902.png and /dev/null differ diff --git a/imgs/renders/1904.png b/imgs/renders/1904.png deleted file mode 100644 index 854490d37..000000000 Binary files a/imgs/renders/1904.png and /dev/null differ diff --git a/imgs/renders/1906.png b/imgs/renders/1906.png deleted file mode 100644 index aae52b44d..000000000 Binary files a/imgs/renders/1906.png and /dev/null differ diff --git a/imgs/renders/1908.png b/imgs/renders/1908.png deleted file mode 100644 index 1ed1034b7..000000000 Binary files a/imgs/renders/1908.png and /dev/null differ diff --git a/imgs/renders/1910.png b/imgs/renders/1910.png deleted file mode 100644 index cbc3ceedc..000000000 Binary files a/imgs/renders/1910.png and /dev/null differ diff --git a/imgs/renders/1912.png b/imgs/renders/1912.png deleted file mode 100644 index 8614b1064..000000000 Binary files a/imgs/renders/1912.png and /dev/null differ diff --git a/imgs/renders/1914.png b/imgs/renders/1914.png deleted file mode 100644 index e3d48b48d..000000000 Binary files a/imgs/renders/1914.png and /dev/null differ diff --git a/imgs/renders/1916.png b/imgs/renders/1916.png deleted file mode 100644 index 81f3e3824..000000000 Binary files a/imgs/renders/1916.png and /dev/null differ diff --git a/imgs/renders/1918.png b/imgs/renders/1918.png deleted file mode 100644 index 93b096876..000000000 Binary files a/imgs/renders/1918.png and /dev/null differ diff --git a/imgs/renders/1944.png b/imgs/renders/1944.png index 9c3fa8fdd..36ff10ad4 100644 Binary files a/imgs/renders/1944.png and b/imgs/renders/1944.png differ diff --git a/imgs/renders/19720.png b/imgs/renders/19720.png index 2a9dbe4e2..0ffcdbab9 100644 Binary files a/imgs/renders/19720.png and b/imgs/renders/19720.png differ diff --git a/imgs/renders/19722.png b/imgs/renders/19722.png index b907e202e..55d8cefd9 100644 Binary files a/imgs/renders/19722.png and b/imgs/renders/19722.png differ diff --git a/imgs/renders/19724.png b/imgs/renders/19724.png index 3b4010a5f..de93acd6e 100644 Binary files a/imgs/renders/19724.png and b/imgs/renders/19724.png differ diff --git a/imgs/renders/19726.png b/imgs/renders/19726.png index 7b7793ef1..01706208f 100644 Binary files a/imgs/renders/19726.png and b/imgs/renders/19726.png differ diff --git a/imgs/renders/19744.png b/imgs/renders/19744.png index 2f436000a..3dae640ae 100644 Binary files a/imgs/renders/19744.png and b/imgs/renders/19744.png differ diff --git a/imgs/renders/19770.png b/imgs/renders/19770.png deleted file mode 100644 index 724cb2468..000000000 Binary files a/imgs/renders/19770.png and /dev/null differ diff --git a/imgs/renders/2006.png b/imgs/renders/2006.png index af886866f..b1377357b 100644 Binary files a/imgs/renders/2006.png and b/imgs/renders/2006.png differ diff --git a/imgs/renders/20067.png b/imgs/renders/20067.png deleted file mode 100644 index 7127a29fe..000000000 Binary files a/imgs/renders/20067.png and /dev/null differ diff --git a/imgs/renders/20122.png b/imgs/renders/20122.png deleted file mode 100644 index c06ce933f..000000000 Binary files a/imgs/renders/20122.png and /dev/null differ diff --git a/imgs/renders/20125.png b/imgs/renders/20125.png index e9ed3cff4..554e6a17c 100644 Binary files a/imgs/renders/20125.png and b/imgs/renders/20125.png differ diff --git a/imgs/renders/20183.png b/imgs/renders/20183.png index fa7cddfa6..913c105c4 100644 Binary files a/imgs/renders/20183.png and b/imgs/renders/20183.png differ diff --git a/imgs/renders/20185.png b/imgs/renders/20185.png index dc373bee8..542f79e67 100644 Binary files a/imgs/renders/20185.png and b/imgs/renders/20185.png differ diff --git a/imgs/renders/20187.png b/imgs/renders/20187.png index 25cac2188..c8633ab8c 100644 Binary files a/imgs/renders/20187.png and b/imgs/renders/20187.png differ diff --git a/imgs/renders/20189.png b/imgs/renders/20189.png index 3e9889460..3c7600a96 100644 Binary files a/imgs/renders/20189.png and b/imgs/renders/20189.png differ diff --git a/imgs/renders/2078.png b/imgs/renders/2078.png index 802ade32c..9c589200d 100644 Binary files a/imgs/renders/2078.png and b/imgs/renders/2078.png differ diff --git a/imgs/renders/21097.png b/imgs/renders/21097.png index 3b5e962e6..ba94fbcdb 100644 Binary files a/imgs/renders/21097.png and b/imgs/renders/21097.png differ diff --git a/imgs/renders/2161.png b/imgs/renders/2161.png index 7cadd4ed0..3b7357aa5 100644 Binary files a/imgs/renders/2161.png and b/imgs/renders/2161.png differ diff --git a/imgs/renders/21628.png b/imgs/renders/21628.png index 6dfb79cc5..e9f1afb63 100644 Binary files a/imgs/renders/21628.png and b/imgs/renders/21628.png differ diff --git a/imgs/renders/2164.png b/imgs/renders/2164.png deleted file mode 100644 index 2533df2b5..000000000 Binary files a/imgs/renders/2164.png and /dev/null differ diff --git a/imgs/renders/2166.png b/imgs/renders/2166.png deleted file mode 100644 index 1b48fd4c2..000000000 Binary files a/imgs/renders/2166.png and /dev/null differ diff --git a/imgs/renders/2168.png b/imgs/renders/2168.png deleted file mode 100644 index a814bf6a6..000000000 Binary files a/imgs/renders/2168.png and /dev/null differ diff --git a/imgs/renders/22426.png b/imgs/renders/22426.png deleted file mode 100644 index 463dfa4ff..000000000 Binary files a/imgs/renders/22426.png and /dev/null differ diff --git a/imgs/renders/22428.png b/imgs/renders/22428.png index 090ce18dc..71aaf8f4e 100644 Binary files a/imgs/renders/22428.png and b/imgs/renders/22428.png differ diff --git a/imgs/renders/22430.png b/imgs/renders/22430.png index fbb02e868..af78fde73 100644 Binary files a/imgs/renders/22430.png and b/imgs/renders/22430.png differ diff --git a/imgs/renders/22432.png b/imgs/renders/22432.png deleted file mode 100644 index 90ec63b8a..000000000 Binary files a/imgs/renders/22432.png and /dev/null differ diff --git a/imgs/renders/22434.png b/imgs/renders/22434.png deleted file mode 100644 index a5f855b67..000000000 Binary files a/imgs/renders/22434.png and /dev/null differ diff --git a/imgs/renders/22436.png b/imgs/renders/22436.png index 2e46a25e1..a66a042fc 100644 Binary files a/imgs/renders/22436.png and b/imgs/renders/22436.png differ diff --git a/imgs/renders/22438.png b/imgs/renders/22438.png deleted file mode 100644 index d7f1ec5fa..000000000 Binary files a/imgs/renders/22438.png and /dev/null differ diff --git a/imgs/renders/22440.png b/imgs/renders/22440.png index 2e22ab1a4..89c553aa8 100644 Binary files a/imgs/renders/22440.png and b/imgs/renders/22440.png differ diff --git a/imgs/renders/22442.png b/imgs/renders/22442.png index f5cf2aecb..6e04a38e5 100644 Binary files a/imgs/renders/22442.png and b/imgs/renders/22442.png differ diff --git a/imgs/renders/22444.png b/imgs/renders/22444.png index a43e3bef9..53e45c0b4 100644 Binary files a/imgs/renders/22444.png and b/imgs/renders/22444.png differ diff --git a/imgs/renders/22446.png b/imgs/renders/22446.png index 0a187659c..b024e7f66 100644 Binary files a/imgs/renders/22446.png and b/imgs/renders/22446.png differ diff --git a/imgs/renders/22448.png b/imgs/renders/22448.png index d20f90967..3d1530008 100644 Binary files a/imgs/renders/22448.png and b/imgs/renders/22448.png differ diff --git a/imgs/renders/22450.png b/imgs/renders/22450.png deleted file mode 100644 index 307648fc0..000000000 Binary files a/imgs/renders/22450.png and /dev/null differ diff --git a/imgs/renders/22452.png b/imgs/renders/22452.png index bdc6660ca..9424b7f8d 100644 Binary files a/imgs/renders/22452.png and b/imgs/renders/22452.png differ diff --git a/imgs/renders/22454.png b/imgs/renders/22454.png deleted file mode 100644 index c605136c7..000000000 Binary files a/imgs/renders/22454.png and /dev/null differ diff --git a/imgs/renders/22456.png b/imgs/renders/22456.png index 6b0947f3f..7142c8782 100644 Binary files a/imgs/renders/22456.png and b/imgs/renders/22456.png differ diff --git a/imgs/renders/22458.png b/imgs/renders/22458.png deleted file mode 100644 index bf944e374..000000000 Binary files a/imgs/renders/22458.png and /dev/null differ diff --git a/imgs/renders/22460.png b/imgs/renders/22460.png index 2c112f724..92dbd2e99 100644 Binary files a/imgs/renders/22460.png and b/imgs/renders/22460.png differ diff --git a/imgs/renders/22462.png b/imgs/renders/22462.png deleted file mode 100644 index 40380580b..000000000 Binary files a/imgs/renders/22462.png and /dev/null differ diff --git a/imgs/renders/22464.png b/imgs/renders/22464.png index 2270c734a..3158871d7 100644 Binary files a/imgs/renders/22464.png and b/imgs/renders/22464.png differ diff --git a/imgs/renders/22466.png b/imgs/renders/22466.png index 50f6a0fb6..7b9e14b5c 100644 Binary files a/imgs/renders/22466.png and b/imgs/renders/22466.png differ diff --git a/imgs/renders/22468.png b/imgs/renders/22468.png index 1ed25f229..d27945674 100644 Binary files a/imgs/renders/22468.png and b/imgs/renders/22468.png differ diff --git a/imgs/renders/22470.png b/imgs/renders/22470.png index 2a97da1bd..2500548ad 100644 Binary files a/imgs/renders/22470.png and b/imgs/renders/22470.png differ diff --git a/imgs/renders/22472.png b/imgs/renders/22472.png deleted file mode 100644 index 2c535a3c7..000000000 Binary files a/imgs/renders/22472.png and /dev/null differ diff --git a/imgs/renders/22474.png b/imgs/renders/22474.png index 609037a0d..dabff8d17 100644 Binary files a/imgs/renders/22474.png and b/imgs/renders/22474.png differ diff --git a/imgs/renders/22544.png b/imgs/renders/22544.png index e076d426f..c7accef7b 100644 Binary files a/imgs/renders/22544.png and b/imgs/renders/22544.png differ diff --git a/imgs/renders/22546.png b/imgs/renders/22546.png index bdab522f4..63d5120a1 100644 Binary files a/imgs/renders/22546.png and b/imgs/renders/22546.png differ diff --git a/imgs/renders/22548.png b/imgs/renders/22548.png index 205af627c..a784a7952 100644 Binary files a/imgs/renders/22548.png and b/imgs/renders/22548.png differ diff --git a/imgs/renders/22579.png b/imgs/renders/22579.png deleted file mode 100644 index cd7299c4e..000000000 Binary files a/imgs/renders/22579.png and /dev/null differ diff --git a/imgs/renders/22852.png b/imgs/renders/22852.png index d33f80a61..49d66346d 100644 Binary files a/imgs/renders/22852.png and b/imgs/renders/22852.png differ diff --git a/imgs/renders/23693.png b/imgs/renders/23693.png deleted file mode 100644 index 0725a9f66..000000000 Binary files a/imgs/renders/23693.png and /dev/null differ diff --git a/imgs/renders/23757.png b/imgs/renders/23757.png index 493221769..dd854d4df 100644 Binary files a/imgs/renders/23757.png and b/imgs/renders/23757.png differ diff --git a/imgs/renders/23773.png b/imgs/renders/23773.png index 9fd0d2137..f318658bd 100644 Binary files a/imgs/renders/23773.png and b/imgs/renders/23773.png differ diff --git a/imgs/renders/23911.png b/imgs/renders/23911.png index f2bdf4452..8472b288c 100644 Binary files a/imgs/renders/23911.png and b/imgs/renders/23911.png differ diff --git a/imgs/renders/23913.png b/imgs/renders/23913.png index e0466778a..cfddcdc15 100644 Binary files a/imgs/renders/23913.png and b/imgs/renders/23913.png differ diff --git a/imgs/renders/23915.png b/imgs/renders/23915.png index ca7f302ef..5ae1caf44 100644 Binary files a/imgs/renders/23915.png and b/imgs/renders/23915.png differ diff --git a/imgs/renders/23917.png b/imgs/renders/23917.png index b18d375e9..714794ae5 100644 Binary files a/imgs/renders/23917.png and b/imgs/renders/23917.png differ diff --git a/imgs/renders/23919.png b/imgs/renders/23919.png index ea97e1801..74e61caab 100644 Binary files a/imgs/renders/23919.png and b/imgs/renders/23919.png differ diff --git a/imgs/renders/24448.png b/imgs/renders/24448.png deleted file mode 100644 index ca5af11f8..000000000 Binary files a/imgs/renders/24448.png and /dev/null differ diff --git a/imgs/renders/24483.png b/imgs/renders/24483.png index 0aecf7da3..007b6da8e 100644 Binary files a/imgs/renders/24483.png and b/imgs/renders/24483.png differ diff --git a/imgs/renders/24688.png b/imgs/renders/24688.png index 3727722bc..6376a4d6d 100644 Binary files a/imgs/renders/24688.png and b/imgs/renders/24688.png differ diff --git a/imgs/renders/24690.png b/imgs/renders/24690.png index ade11987a..306a640d0 100644 Binary files a/imgs/renders/24690.png and b/imgs/renders/24690.png differ diff --git a/imgs/renders/24692.png b/imgs/renders/24692.png index 6cbbe514e..d91b62cbb 100644 Binary files a/imgs/renders/24692.png and b/imgs/renders/24692.png differ diff --git a/imgs/renders/24694.png b/imgs/renders/24694.png index 5ee0176df..d8012a4c6 100644 Binary files a/imgs/renders/24694.png and b/imgs/renders/24694.png differ diff --git a/imgs/renders/24696.png b/imgs/renders/24696.png index 00e05c3d1..b01590821 100644 Binary files a/imgs/renders/24696.png and b/imgs/renders/24696.png differ diff --git a/imgs/renders/24698.png b/imgs/renders/24698.png index 9e06f2e71..a8c4c5cc0 100644 Binary files a/imgs/renders/24698.png and b/imgs/renders/24698.png differ diff --git a/imgs/renders/24700.png b/imgs/renders/24700.png index 96ba886a8..64a48a852 100644 Binary files a/imgs/renders/24700.png and b/imgs/renders/24700.png differ diff --git a/imgs/renders/24702.png b/imgs/renders/24702.png index ce8fc5f7c..1993c8469 100644 Binary files a/imgs/renders/24702.png and b/imgs/renders/24702.png differ diff --git a/imgs/renders/25426.png b/imgs/renders/25426.png deleted file mode 100644 index 3d09ad258..000000000 Binary files a/imgs/renders/25426.png and /dev/null differ diff --git a/imgs/renders/25560.png b/imgs/renders/25560.png deleted file mode 100644 index 8ee2185a9..000000000 Binary files a/imgs/renders/25560.png and /dev/null differ diff --git a/imgs/renders/26840.png b/imgs/renders/26840.png index 64299f382..aecd27c78 100644 Binary files a/imgs/renders/26840.png and b/imgs/renders/26840.png differ diff --git a/imgs/renders/26842.png b/imgs/renders/26842.png index 3bd5ff519..ae240f33e 100644 Binary files a/imgs/renders/26842.png and b/imgs/renders/26842.png differ diff --git a/imgs/renders/26872.png b/imgs/renders/26872.png deleted file mode 100644 index d5db21061..000000000 Binary files a/imgs/renders/26872.png and /dev/null differ diff --git a/imgs/renders/26874.png b/imgs/renders/26874.png deleted file mode 100644 index a4e487dae..000000000 Binary files a/imgs/renders/26874.png and /dev/null differ diff --git a/imgs/renders/26876.png b/imgs/renders/26876.png deleted file mode 100644 index 4df3f95d3..000000000 Binary files a/imgs/renders/26876.png and /dev/null differ diff --git a/imgs/renders/27299.png b/imgs/renders/27299.png deleted file mode 100644 index 472210e7a..000000000 Binary files a/imgs/renders/27299.png and /dev/null differ diff --git a/imgs/renders/27301.png b/imgs/renders/27301.png deleted file mode 100644 index 9fa02961e..000000000 Binary files a/imgs/renders/27301.png and /dev/null differ diff --git a/imgs/renders/27303.png b/imgs/renders/27303.png deleted file mode 100644 index b0e1d2d6a..000000000 Binary files a/imgs/renders/27303.png and /dev/null differ diff --git a/imgs/renders/27305.png b/imgs/renders/27305.png deleted file mode 100644 index 2a3ec2fe7..000000000 Binary files a/imgs/renders/27305.png and /dev/null differ diff --git a/imgs/renders/28310.png b/imgs/renders/28310.png deleted file mode 100644 index a0236b7f8..000000000 Binary files a/imgs/renders/28310.png and /dev/null differ diff --git a/imgs/renders/2834.png b/imgs/renders/2834.png index 6521eb4bb..b9dcb96e3 100644 Binary files a/imgs/renders/2834.png and b/imgs/renders/2834.png differ diff --git a/imgs/renders/28352.png b/imgs/renders/28352.png index 07299ca47..b4991c240 100644 Binary files a/imgs/renders/28352.png and b/imgs/renders/28352.png differ diff --git a/imgs/renders/2836.png b/imgs/renders/2836.png index 5de0ff9e1..6a6f42330 100644 Binary files a/imgs/renders/2836.png and b/imgs/renders/2836.png differ diff --git a/imgs/renders/28606.png b/imgs/renders/28606.png index 38e28eb43..585522404 100644 Binary files a/imgs/renders/28606.png and b/imgs/renders/28606.png differ diff --git a/imgs/renders/2863.png b/imgs/renders/2863.png index 5bff668ea..04ff60da0 100644 Binary files a/imgs/renders/2863.png and b/imgs/renders/2863.png differ diff --git a/imgs/renders/28659.png b/imgs/renders/28659.png index d1b3bf94f..61f8fdf30 100644 Binary files a/imgs/renders/28659.png and b/imgs/renders/28659.png differ diff --git a/imgs/renders/28661.png b/imgs/renders/28661.png index 9795bc555..d5dc3e86f 100644 Binary files a/imgs/renders/28661.png and b/imgs/renders/28661.png differ diff --git a/imgs/renders/28665.png b/imgs/renders/28665.png index 924573d58..ce1b9b0a3 100644 Binary files a/imgs/renders/28665.png and b/imgs/renders/28665.png differ diff --git a/imgs/renders/28710.png b/imgs/renders/28710.png index 7733623fd..44e2fd2f2 100644 Binary files a/imgs/renders/28710.png and b/imgs/renders/28710.png differ diff --git a/imgs/renders/28824.png b/imgs/renders/28824.png deleted file mode 100644 index f8c159336..000000000 Binary files a/imgs/renders/28824.png and /dev/null differ diff --git a/imgs/renders/28844.png b/imgs/renders/28844.png index 66725befd..60df79006 100644 Binary files a/imgs/renders/28844.png and b/imgs/renders/28844.png differ diff --git a/imgs/renders/28846.png b/imgs/renders/28846.png index 2899ac977..31898e2a3 100644 Binary files a/imgs/renders/28846.png and b/imgs/renders/28846.png differ diff --git a/imgs/renders/28848.png b/imgs/renders/28848.png index c1e1dee52..f50843aa5 100644 Binary files a/imgs/renders/28848.png and b/imgs/renders/28848.png differ diff --git a/imgs/renders/28850.png b/imgs/renders/28850.png index 1699bb34d..6bb510dce 100644 Binary files a/imgs/renders/28850.png and b/imgs/renders/28850.png differ diff --git a/imgs/renders/29248.png b/imgs/renders/29248.png index ec5b084e7..64af89c39 100644 Binary files a/imgs/renders/29248.png and b/imgs/renders/29248.png differ diff --git a/imgs/renders/29266.png b/imgs/renders/29266.png index 4af4dab00..073a8955d 100644 Binary files a/imgs/renders/29266.png and b/imgs/renders/29266.png differ diff --git a/imgs/renders/29328.png b/imgs/renders/29328.png deleted file mode 100644 index 61eb23046..000000000 Binary files a/imgs/renders/29328.png and /dev/null differ diff --git a/imgs/renders/29330.png b/imgs/renders/29330.png deleted file mode 100644 index 93095170b..000000000 Binary files a/imgs/renders/29330.png and /dev/null differ diff --git a/imgs/renders/29332.png b/imgs/renders/29332.png deleted file mode 100644 index 6f95ea7ec..000000000 Binary files a/imgs/renders/29332.png and /dev/null differ diff --git a/imgs/renders/29334.png b/imgs/renders/29334.png deleted file mode 100644 index 3768a8239..000000000 Binary files a/imgs/renders/29334.png and /dev/null differ diff --git a/imgs/renders/29336.png b/imgs/renders/29336.png index fe3e143cb..c80a4674a 100644 Binary files a/imgs/renders/29336.png and b/imgs/renders/29336.png differ diff --git a/imgs/renders/29337.png b/imgs/renders/29337.png index fb10739d2..4c58953e7 100644 Binary files a/imgs/renders/29337.png and b/imgs/renders/29337.png differ diff --git a/imgs/renders/29340.png b/imgs/renders/29340.png index e45301331..1879bf84e 100644 Binary files a/imgs/renders/29340.png and b/imgs/renders/29340.png differ diff --git a/imgs/renders/29344.png b/imgs/renders/29344.png index db9d7dd98..b1cc30a56 100644 Binary files a/imgs/renders/29344.png and b/imgs/renders/29344.png differ diff --git a/imgs/renders/2998.png b/imgs/renders/2998.png index e8a952550..94630a292 100644 Binary files a/imgs/renders/2998.png and b/imgs/renders/2998.png differ diff --git a/imgs/renders/29984.png b/imgs/renders/29984.png index 39f7181a0..3a126e25f 100644 Binary files a/imgs/renders/29984.png and b/imgs/renders/29984.png differ diff --git a/imgs/renders/29986.png b/imgs/renders/29986.png index 692156e32..5adfd68e1 100644 Binary files a/imgs/renders/29986.png and b/imgs/renders/29986.png differ diff --git a/imgs/renders/29988.png b/imgs/renders/29988.png index 5db8690a8..5e31d6689 100644 Binary files a/imgs/renders/29988.png and b/imgs/renders/29988.png differ diff --git a/imgs/renders/29990.png b/imgs/renders/29990.png index 7e896b739..529f59377 100644 Binary files a/imgs/renders/29990.png and b/imgs/renders/29990.png differ diff --git a/imgs/renders/30842.png b/imgs/renders/30842.png index c899669dd..2831b8c55 100644 Binary files a/imgs/renders/30842.png and b/imgs/renders/30842.png differ diff --git a/imgs/renders/32207.png b/imgs/renders/32207.png index e716f18c6..240347bd4 100644 Binary files a/imgs/renders/32207.png and b/imgs/renders/32207.png differ diff --git a/imgs/renders/32209.png b/imgs/renders/32209.png index a63206040..38d534a39 100644 Binary files a/imgs/renders/32209.png and b/imgs/renders/32209.png differ diff --git a/imgs/renders/32305.png b/imgs/renders/32305.png index 94159230f..f6d5b9ef3 100644 Binary files a/imgs/renders/32305.png and b/imgs/renders/32305.png differ diff --git a/imgs/renders/32307.png b/imgs/renders/32307.png index 768b306a6..e79bb5c52 100644 Binary files a/imgs/renders/32307.png and b/imgs/renders/32307.png differ diff --git a/imgs/renders/32309.png b/imgs/renders/32309.png index b4c76a4fd..83443e7a6 100644 Binary files a/imgs/renders/32309.png and b/imgs/renders/32309.png differ diff --git a/imgs/renders/32311.png b/imgs/renders/32311.png index c1d42f75a..630fce427 100644 Binary files a/imgs/renders/32311.png and b/imgs/renders/32311.png differ diff --git a/imgs/renders/32788.png b/imgs/renders/32788.png index ba194d5d4..2cdd23f36 100644 Binary files a/imgs/renders/32788.png and b/imgs/renders/32788.png differ diff --git a/imgs/renders/32790.png b/imgs/renders/32790.png index 03c13307d..b38da752c 100644 Binary files a/imgs/renders/32790.png and b/imgs/renders/32790.png differ diff --git a/imgs/renders/32811.png b/imgs/renders/32811.png index 308088b91..56636bd3a 100644 Binary files a/imgs/renders/32811.png and b/imgs/renders/32811.png differ diff --git a/imgs/renders/32840.png b/imgs/renders/32840.png deleted file mode 100644 index f88af5e63..000000000 Binary files a/imgs/renders/32840.png and /dev/null differ diff --git a/imgs/renders/32842.png b/imgs/renders/32842.png deleted file mode 100644 index 793df6054..000000000 Binary files a/imgs/renders/32842.png and /dev/null differ diff --git a/imgs/renders/32844.png b/imgs/renders/32844.png deleted file mode 100644 index 243f17803..000000000 Binary files a/imgs/renders/32844.png and /dev/null differ diff --git a/imgs/renders/32846.png b/imgs/renders/32846.png deleted file mode 100644 index 4d3998a0c..000000000 Binary files a/imgs/renders/32846.png and /dev/null differ diff --git a/imgs/renders/32848.png b/imgs/renders/32848.png deleted file mode 100644 index 8dfb6b407..000000000 Binary files a/imgs/renders/32848.png and /dev/null differ diff --git a/imgs/renders/32872.png b/imgs/renders/32872.png index 7a2b2c94e..cf6607d03 100644 Binary files a/imgs/renders/32872.png and b/imgs/renders/32872.png differ diff --git a/imgs/renders/32874.png b/imgs/renders/32874.png index 27b4d8163..6b7d449a4 100644 Binary files a/imgs/renders/32874.png and b/imgs/renders/32874.png differ diff --git a/imgs/renders/32876.png b/imgs/renders/32876.png index 51d86e566..572a7f3d7 100644 Binary files a/imgs/renders/32876.png and b/imgs/renders/32876.png differ diff --git a/imgs/renders/32878.png b/imgs/renders/32878.png index f10039bfd..4146be95e 100644 Binary files a/imgs/renders/32878.png and b/imgs/renders/32878.png differ diff --git a/imgs/renders/32880.png b/imgs/renders/32880.png index ead70e4dd..356d98c4f 100644 Binary files a/imgs/renders/32880.png and b/imgs/renders/32880.png differ diff --git a/imgs/renders/32983.png b/imgs/renders/32983.png deleted file mode 100644 index 9355c4ae1..000000000 Binary files a/imgs/renders/32983.png and /dev/null differ diff --git a/imgs/renders/32985.png b/imgs/renders/32985.png deleted file mode 100644 index 24627af58..000000000 Binary files a/imgs/renders/32985.png and /dev/null differ diff --git a/imgs/renders/32987.png b/imgs/renders/32987.png deleted file mode 100644 index f7d772e7e..000000000 Binary files a/imgs/renders/32987.png and /dev/null differ diff --git a/imgs/renders/32989.png b/imgs/renders/32989.png deleted file mode 100644 index 442bff292..000000000 Binary files a/imgs/renders/32989.png and /dev/null differ diff --git a/imgs/renders/33079.png b/imgs/renders/33079.png index 7ca9710f3..3db3be1a5 100644 Binary files a/imgs/renders/33079.png and b/imgs/renders/33079.png differ diff --git a/imgs/renders/33081.png b/imgs/renders/33081.png index 17b51be28..bb3a03933 100644 Binary files a/imgs/renders/33081.png and b/imgs/renders/33081.png differ diff --git a/imgs/renders/33083.png b/imgs/renders/33083.png index b3a7c864e..ccba8c16d 100644 Binary files a/imgs/renders/33083.png and b/imgs/renders/33083.png differ diff --git a/imgs/renders/33151.png b/imgs/renders/33151.png index 18c5e8586..4f958d5b4 100644 Binary files a/imgs/renders/33151.png and b/imgs/renders/33151.png differ diff --git a/imgs/renders/33153.png b/imgs/renders/33153.png index 66ca96d61..13f671270 100644 Binary files a/imgs/renders/33153.png and b/imgs/renders/33153.png differ diff --git a/imgs/renders/33155.png b/imgs/renders/33155.png index ee90152b4..5947fd012 100644 Binary files a/imgs/renders/33155.png and b/imgs/renders/33155.png differ diff --git a/imgs/renders/33157.png b/imgs/renders/33157.png index 80c59b942..99a5aa38c 100644 Binary files a/imgs/renders/33157.png and b/imgs/renders/33157.png differ diff --git a/imgs/renders/33395.png b/imgs/renders/33395.png index d3d1842aa..c6bdb66aa 100644 Binary files a/imgs/renders/33395.png and b/imgs/renders/33395.png differ diff --git a/imgs/renders/33397.png b/imgs/renders/33397.png index 8d080a34d..fb5fb512f 100644 Binary files a/imgs/renders/33397.png and b/imgs/renders/33397.png differ diff --git a/imgs/renders/33468.png b/imgs/renders/33468.png index 9b2441964..6606f2c69 100644 Binary files a/imgs/renders/33468.png and b/imgs/renders/33468.png differ diff --git a/imgs/renders/33470.png b/imgs/renders/33470.png index bb2b12e2b..9cca50559 100644 Binary files a/imgs/renders/33470.png and b/imgs/renders/33470.png differ diff --git a/imgs/renders/33472.png b/imgs/renders/33472.png index 56872b5bc..351044eb5 100644 Binary files a/imgs/renders/33472.png and b/imgs/renders/33472.png differ diff --git a/imgs/renders/33513.png b/imgs/renders/33513.png index 8a222041d..15e7c9a17 100644 Binary files a/imgs/renders/33513.png and b/imgs/renders/33513.png differ diff --git a/imgs/renders/33553.png b/imgs/renders/33553.png index 395170c94..19d7dfa45 100644 Binary files a/imgs/renders/33553.png and b/imgs/renders/33553.png differ diff --git a/imgs/renders/33673.png b/imgs/renders/33673.png index 095487d50..c1962ea45 100644 Binary files a/imgs/renders/33673.png and b/imgs/renders/33673.png differ diff --git a/imgs/renders/33675.png b/imgs/renders/33675.png index d79b1f6a9..5b9d7cb13 100644 Binary files a/imgs/renders/33675.png and b/imgs/renders/33675.png differ diff --git a/imgs/renders/33697.png b/imgs/renders/33697.png index 4cb463e67..0e53faa6c 100644 Binary files a/imgs/renders/33697.png and b/imgs/renders/33697.png differ diff --git a/imgs/renders/33816.png b/imgs/renders/33816.png index 8715a5186..f3fd0e670 100644 Binary files a/imgs/renders/33816.png and b/imgs/renders/33816.png differ diff --git a/imgs/renders/33818.png b/imgs/renders/33818.png index 77abade92..7e572efa8 100644 Binary files a/imgs/renders/33818.png and b/imgs/renders/33818.png differ diff --git a/imgs/renders/33820.png b/imgs/renders/33820.png index 8fc227285..91cd5aba9 100644 Binary files a/imgs/renders/33820.png and b/imgs/renders/33820.png differ diff --git a/imgs/renders/34151.png b/imgs/renders/34151.png index bf8a8d147..7dad71ef8 100644 Binary files a/imgs/renders/34151.png and b/imgs/renders/34151.png differ diff --git a/imgs/renders/34317.png b/imgs/renders/34317.png index 237a8a093..d3604598e 100644 Binary files a/imgs/renders/34317.png and b/imgs/renders/34317.png differ diff --git a/imgs/renders/34328.png b/imgs/renders/34328.png index 90be0da56..9f4d50b8a 100644 Binary files a/imgs/renders/34328.png and b/imgs/renders/34328.png differ diff --git a/imgs/renders/34496.png b/imgs/renders/34496.png index cd6d661af..78a3c7eb2 100644 Binary files a/imgs/renders/34496.png and b/imgs/renders/34496.png differ diff --git a/imgs/renders/34562.png b/imgs/renders/34562.png index 6eb7f784b..03200d301 100644 Binary files a/imgs/renders/34562.png and b/imgs/renders/34562.png differ diff --git a/imgs/renders/34590.png b/imgs/renders/34590.png index f7f2b837b..0b80f3cd9 100644 Binary files a/imgs/renders/34590.png and b/imgs/renders/34590.png differ diff --git a/imgs/renders/34828.png b/imgs/renders/34828.png index fcc20574e..93ada7c87 100644 Binary files a/imgs/renders/34828.png and b/imgs/renders/34828.png differ diff --git a/imgs/renders/3514.png b/imgs/renders/3514.png index 3f79fde1d..48e552bbd 100644 Binary files a/imgs/renders/3514.png and b/imgs/renders/3514.png differ diff --git a/imgs/renders/3516.png b/imgs/renders/3516.png index ba546bf57..29f9b1122 100644 Binary files a/imgs/renders/3516.png and b/imgs/renders/3516.png differ diff --git a/imgs/renders/3518.png b/imgs/renders/3518.png index 6c92c28e5..a7aec2248 100644 Binary files a/imgs/renders/3518.png and b/imgs/renders/3518.png differ diff --git a/imgs/renders/3532.png b/imgs/renders/3532.png index 774de8610..0ee7ed351 100644 Binary files a/imgs/renders/3532.png and b/imgs/renders/3532.png differ diff --git a/imgs/renders/35683.png b/imgs/renders/35683.png index bc0dd4276..3413a046b 100644 Binary files a/imgs/renders/35683.png and b/imgs/renders/35683.png differ diff --git a/imgs/renders/35779.png b/imgs/renders/35779.png index c0fde6d67..d215ec668 100644 Binary files a/imgs/renders/35779.png and b/imgs/renders/35779.png differ diff --git a/imgs/renders/35781.png b/imgs/renders/35781.png index 79d5e6670..e7de9f9e6 100644 Binary files a/imgs/renders/35781.png and b/imgs/renders/35781.png differ diff --git a/imgs/renders/3628.png b/imgs/renders/3628.png deleted file mode 100644 index d14767948..000000000 Binary files a/imgs/renders/3628.png and /dev/null differ diff --git a/imgs/renders/37135.png b/imgs/renders/37135.png new file mode 100644 index 000000000..9f596de10 Binary files /dev/null and b/imgs/renders/37135.png differ diff --git a/imgs/renders/37453.png b/imgs/renders/37453.png new file mode 100644 index 000000000..575a418bb Binary files /dev/null and b/imgs/renders/37453.png differ diff --git a/imgs/renders/37454.png b/imgs/renders/37454.png new file mode 100644 index 000000000..31ac83e1f Binary files /dev/null and b/imgs/renders/37454.png differ diff --git a/imgs/renders/37455.png b/imgs/renders/37455.png new file mode 100644 index 000000000..b30b4b88e Binary files /dev/null and b/imgs/renders/37455.png differ diff --git a/imgs/renders/37456.png b/imgs/renders/37456.png new file mode 100644 index 000000000..0edfbec2b Binary files /dev/null and b/imgs/renders/37456.png differ diff --git a/imgs/renders/37457.png b/imgs/renders/37457.png new file mode 100644 index 000000000..8f42b0bdf Binary files /dev/null and b/imgs/renders/37457.png differ diff --git a/imgs/renders/37458.png b/imgs/renders/37458.png new file mode 100644 index 000000000..5a20a743c Binary files /dev/null and b/imgs/renders/37458.png differ diff --git a/imgs/renders/37459.png b/imgs/renders/37459.png new file mode 100644 index 000000000..ff745cd26 Binary files /dev/null and b/imgs/renders/37459.png differ diff --git a/imgs/renders/37460.png b/imgs/renders/37460.png new file mode 100644 index 000000000..4ff569799 Binary files /dev/null and b/imgs/renders/37460.png differ diff --git a/imgs/renders/37480.png b/imgs/renders/37480.png new file mode 100644 index 000000000..79ef03e0f Binary files /dev/null and b/imgs/renders/37480.png differ diff --git a/imgs/renders/37481.png b/imgs/renders/37481.png new file mode 100644 index 000000000..9bc8184d7 Binary files /dev/null and b/imgs/renders/37481.png differ diff --git a/imgs/renders/37482.png b/imgs/renders/37482.png new file mode 100644 index 000000000..609367af8 Binary files /dev/null and b/imgs/renders/37482.png differ diff --git a/imgs/renders/37483.png b/imgs/renders/37483.png new file mode 100644 index 000000000..22347022d Binary files /dev/null and b/imgs/renders/37483.png differ diff --git a/imgs/renders/3751.png b/imgs/renders/3751.png deleted file mode 100644 index 25d31c085..000000000 Binary files a/imgs/renders/3751.png and /dev/null differ diff --git a/imgs/renders/3753.png b/imgs/renders/3753.png deleted file mode 100644 index 96299eff7..000000000 Binary files a/imgs/renders/3753.png and /dev/null differ diff --git a/imgs/renders/3756.png b/imgs/renders/3756.png index 286f87705..d1c1d6d09 100644 Binary files a/imgs/renders/3756.png and b/imgs/renders/3756.png differ diff --git a/imgs/renders/3764.png b/imgs/renders/3764.png index 30e436b9b..8d25f7825 100644 Binary files a/imgs/renders/3764.png and b/imgs/renders/3764.png differ diff --git a/imgs/renders/3766.png b/imgs/renders/3766.png index a20f3b222..b6e27f7c1 100644 Binary files a/imgs/renders/3766.png and b/imgs/renders/3766.png differ diff --git a/imgs/renders/3768.png b/imgs/renders/3768.png deleted file mode 100644 index 19c279804..000000000 Binary files a/imgs/renders/3768.png and /dev/null differ diff --git a/imgs/renders/3878.png b/imgs/renders/3878.png deleted file mode 100644 index 03165e220..000000000 Binary files a/imgs/renders/3878.png and /dev/null differ diff --git a/imgs/renders/4005.png b/imgs/renders/4005.png deleted file mode 100644 index 25f1c60d5..000000000 Binary files a/imgs/renders/4005.png and /dev/null differ diff --git a/imgs/renders/4302.png b/imgs/renders/4302.png index 5e60581b7..459b0416d 100644 Binary files a/imgs/renders/4302.png and b/imgs/renders/4302.png differ diff --git a/imgs/renders/4306.png b/imgs/renders/4306.png index bc5bf6513..0cb7a46f6 100644 Binary files a/imgs/renders/4306.png and b/imgs/renders/4306.png differ diff --git a/imgs/renders/4308.png b/imgs/renders/4308.png index f1ecddea3..a04127fab 100644 Binary files a/imgs/renders/4308.png and b/imgs/renders/4308.png differ diff --git a/imgs/renders/4310.png b/imgs/renders/4310.png index e7e69fe8d..508140910 100644 Binary files a/imgs/renders/4310.png and b/imgs/renders/4310.png differ diff --git a/imgs/renders/4363.png b/imgs/renders/4363.png index 4ee1a9805..b0910f4ad 100644 Binary files a/imgs/renders/4363.png and b/imgs/renders/4363.png differ diff --git a/imgs/renders/4388.png b/imgs/renders/4388.png index f0051fb34..8048a6c2c 100644 Binary files a/imgs/renders/4388.png and b/imgs/renders/4388.png differ diff --git a/imgs/renders/582.png b/imgs/renders/582.png index be73ab2ce..37718ce83 100644 Binary files a/imgs/renders/582.png and b/imgs/renders/582.png differ diff --git a/imgs/renders/583.png b/imgs/renders/583.png index 42ef6096a..bd98cd510 100644 Binary files a/imgs/renders/583.png and b/imgs/renders/583.png differ diff --git a/imgs/renders/584.png b/imgs/renders/584.png index 6de0a47d4..9f1f224ff 100644 Binary files a/imgs/renders/584.png and b/imgs/renders/584.png differ diff --git a/imgs/renders/585.png b/imgs/renders/585.png index de26b5eaa..f0777c6e3 100644 Binary files a/imgs/renders/585.png and b/imgs/renders/585.png differ diff --git a/imgs/renders/586.png b/imgs/renders/586.png index e5b842742..eeddfa3ec 100644 Binary files a/imgs/renders/586.png and b/imgs/renders/586.png differ diff --git a/imgs/renders/587.png b/imgs/renders/587.png index 43de47eb2..fe4c5a653 100644 Binary files a/imgs/renders/587.png and b/imgs/renders/587.png differ diff --git a/imgs/renders/588.png b/imgs/renders/588.png index c44615de7..cd1188159 100644 Binary files a/imgs/renders/588.png and b/imgs/renders/588.png differ diff --git a/imgs/renders/589.png b/imgs/renders/589.png index b268af9fa..40d8f113b 100644 Binary files a/imgs/renders/589.png and b/imgs/renders/589.png differ diff --git a/imgs/renders/590.png b/imgs/renders/590.png index 7b359e91b..4ecf4d3c6 100644 Binary files a/imgs/renders/590.png and b/imgs/renders/590.png differ diff --git a/imgs/renders/591.png b/imgs/renders/591.png index ef4abc5b4..96bce75fd 100644 Binary files a/imgs/renders/591.png and b/imgs/renders/591.png differ diff --git a/imgs/renders/592.png b/imgs/renders/592.png index 7de72e869..4b8fc8d6e 100644 Binary files a/imgs/renders/592.png and b/imgs/renders/592.png differ diff --git a/imgs/renders/593.png b/imgs/renders/593.png index 67a6fc638..120800038 100644 Binary files a/imgs/renders/593.png and b/imgs/renders/593.png differ diff --git a/imgs/renders/594.png b/imgs/renders/594.png index bc860c5f7..c6ec27e1a 100644 Binary files a/imgs/renders/594.png and b/imgs/renders/594.png differ diff --git a/imgs/renders/595.png b/imgs/renders/595.png deleted file mode 100644 index cd0f17cbb..000000000 Binary files a/imgs/renders/595.png and /dev/null differ diff --git a/imgs/renders/596.png b/imgs/renders/596.png index 0ce46a26c..e019d41ae 100644 Binary files a/imgs/renders/596.png and b/imgs/renders/596.png differ diff --git a/imgs/renders/597.png b/imgs/renders/597.png index 7ba60f5f2..814f4f9ae 100644 Binary files a/imgs/renders/597.png and b/imgs/renders/597.png differ diff --git a/imgs/renders/598.png b/imgs/renders/598.png index b42bbe4bf..4670cf972 100644 Binary files a/imgs/renders/598.png and b/imgs/renders/598.png differ diff --git a/imgs/renders/599.png b/imgs/renders/599.png index 0ecd493e0..762d0d45e 100644 Binary files a/imgs/renders/599.png and b/imgs/renders/599.png differ diff --git a/imgs/renders/600.png b/imgs/renders/600.png deleted file mode 100644 index 04a9630b2..000000000 Binary files a/imgs/renders/600.png and /dev/null differ diff --git a/imgs/renders/601.png b/imgs/renders/601.png index 50268e50b..d6ed875d1 100644 Binary files a/imgs/renders/601.png and b/imgs/renders/601.png differ diff --git a/imgs/renders/602.png b/imgs/renders/602.png index cca90b00a..300349a18 100644 Binary files a/imgs/renders/602.png and b/imgs/renders/602.png differ diff --git a/imgs/renders/603.png b/imgs/renders/603.png index 0160d860d..89a3eab15 100644 Binary files a/imgs/renders/603.png and b/imgs/renders/603.png differ diff --git a/imgs/renders/604.png b/imgs/renders/604.png deleted file mode 100644 index 215cb2fdf..000000000 Binary files a/imgs/renders/604.png and /dev/null differ diff --git a/imgs/renders/605.png b/imgs/renders/605.png index 0e322843f..a295915ed 100644 Binary files a/imgs/renders/605.png and b/imgs/renders/605.png differ diff --git a/imgs/renders/606.png b/imgs/renders/606.png index 03cde2b64..30c516529 100644 Binary files a/imgs/renders/606.png and b/imgs/renders/606.png differ diff --git a/imgs/renders/607.png b/imgs/renders/607.png index 4627955b5..2cfec3475 100644 Binary files a/imgs/renders/607.png and b/imgs/renders/607.png differ diff --git a/imgs/renders/608.png b/imgs/renders/608.png index 293c8ddd1..9988b684b 100644 Binary files a/imgs/renders/608.png and b/imgs/renders/608.png differ diff --git a/imgs/renders/609.png b/imgs/renders/609.png index 905f774e9..d205f36a8 100644 Binary files a/imgs/renders/609.png and b/imgs/renders/609.png differ diff --git a/imgs/renders/610.png b/imgs/renders/610.png deleted file mode 100644 index d7c9eb4a7..000000000 Binary files a/imgs/renders/610.png and /dev/null differ diff --git a/imgs/renders/611.png b/imgs/renders/611.png deleted file mode 100644 index fb9ef189d..000000000 Binary files a/imgs/renders/611.png and /dev/null differ diff --git a/imgs/renders/612.png b/imgs/renders/612.png deleted file mode 100644 index b578fc483..000000000 Binary files a/imgs/renders/612.png and /dev/null differ diff --git a/imgs/renders/613.png b/imgs/renders/613.png deleted file mode 100644 index 51e4f5702..000000000 Binary files a/imgs/renders/613.png and /dev/null differ diff --git a/imgs/renders/614.png b/imgs/renders/614.png deleted file mode 100644 index bd9deb159..000000000 Binary files a/imgs/renders/614.png and /dev/null differ diff --git a/imgs/renders/615.png b/imgs/renders/615.png index 4a3f79048..04d848864 100644 Binary files a/imgs/renders/615.png and b/imgs/renders/615.png differ diff --git a/imgs/renders/616.png b/imgs/renders/616.png deleted file mode 100644 index f3c753d92..000000000 Binary files a/imgs/renders/616.png and /dev/null differ diff --git a/imgs/renders/617.png b/imgs/renders/617.png index cbfb6aaeb..3c5475318 100644 Binary files a/imgs/renders/617.png and b/imgs/renders/617.png differ diff --git a/imgs/renders/618.png b/imgs/renders/618.png deleted file mode 100644 index 143b5e12a..000000000 Binary files a/imgs/renders/618.png and /dev/null differ diff --git a/imgs/renders/619.png b/imgs/renders/619.png deleted file mode 100644 index 66720d2c4..000000000 Binary files a/imgs/renders/619.png and /dev/null differ diff --git a/imgs/renders/620.png b/imgs/renders/620.png index 3301ef83c..1d6a29d5c 100644 Binary files a/imgs/renders/620.png and b/imgs/renders/620.png differ diff --git a/imgs/renders/621.png b/imgs/renders/621.png index 30058205e..f34d75c64 100644 Binary files a/imgs/renders/621.png and b/imgs/renders/621.png differ diff --git a/imgs/renders/622.png b/imgs/renders/622.png index 56ab0727f..2f7a8b546 100644 Binary files a/imgs/renders/622.png and b/imgs/renders/622.png differ diff --git a/imgs/renders/623.png b/imgs/renders/623.png index a6ab23cd7..037243c7a 100644 Binary files a/imgs/renders/623.png and b/imgs/renders/623.png differ diff --git a/imgs/renders/624.png b/imgs/renders/624.png index 424b6dc5d..faf472cb3 100644 Binary files a/imgs/renders/624.png and b/imgs/renders/624.png differ diff --git a/imgs/renders/625.png b/imgs/renders/625.png index 4473e1563..0444d5140 100644 Binary files a/imgs/renders/625.png and b/imgs/renders/625.png differ diff --git a/imgs/renders/626.png b/imgs/renders/626.png index 805da52a6..e0b4ea0d9 100644 Binary files a/imgs/renders/626.png and b/imgs/renders/626.png differ diff --git a/imgs/renders/627.png b/imgs/renders/627.png index 96935b402..47c5db4c0 100644 Binary files a/imgs/renders/627.png and b/imgs/renders/627.png differ diff --git a/imgs/renders/628.png b/imgs/renders/628.png index 0addfff6d..c8e48ce8d 100644 Binary files a/imgs/renders/628.png and b/imgs/renders/628.png differ diff --git a/imgs/renders/629.png b/imgs/renders/629.png index 8a89abd32..6b083c386 100644 Binary files a/imgs/renders/629.png and b/imgs/renders/629.png differ diff --git a/imgs/renders/630.png b/imgs/renders/630.png index e717d450d..da49c4b98 100644 Binary files a/imgs/renders/630.png and b/imgs/renders/630.png differ diff --git a/imgs/renders/631.png b/imgs/renders/631.png index 6f3ccb4bd..d929843ab 100644 Binary files a/imgs/renders/631.png and b/imgs/renders/631.png differ diff --git a/imgs/renders/632.png b/imgs/renders/632.png index 2bed3724d..f1f9e40b9 100644 Binary files a/imgs/renders/632.png and b/imgs/renders/632.png differ diff --git a/imgs/renders/633.png b/imgs/renders/633.png index 1e660a4ce..b676099e9 100644 Binary files a/imgs/renders/633.png and b/imgs/renders/633.png differ diff --git a/imgs/renders/634.png b/imgs/renders/634.png index 9fde459f7..17ec75849 100644 Binary files a/imgs/renders/634.png and b/imgs/renders/634.png differ diff --git a/imgs/renders/635.png b/imgs/renders/635.png index 3a4756c5e..2e4f95913 100644 Binary files a/imgs/renders/635.png and b/imgs/renders/635.png differ diff --git a/imgs/renders/636.png b/imgs/renders/636.png deleted file mode 100644 index 5dbd04136..000000000 Binary files a/imgs/renders/636.png and /dev/null differ diff --git a/imgs/renders/637.png b/imgs/renders/637.png deleted file mode 100644 index 6e903aad1..000000000 Binary files a/imgs/renders/637.png and /dev/null differ diff --git a/imgs/renders/638.png b/imgs/renders/638.png index 39977563f..9757f61ad 100644 Binary files a/imgs/renders/638.png and b/imgs/renders/638.png differ diff --git a/imgs/renders/639.png b/imgs/renders/639.png index bd93ddeb2..b405e5499 100644 Binary files a/imgs/renders/639.png and b/imgs/renders/639.png differ diff --git a/imgs/renders/640.png b/imgs/renders/640.png index 4f110078b..efe0f8d1a 100644 Binary files a/imgs/renders/640.png and b/imgs/renders/640.png differ diff --git a/imgs/renders/641.png b/imgs/renders/641.png index 8378106b6..fa5a41154 100644 Binary files a/imgs/renders/641.png and b/imgs/renders/641.png differ diff --git a/imgs/renders/642.png b/imgs/renders/642.png index ba5191b71..6432e5015 100644 Binary files a/imgs/renders/642.png and b/imgs/renders/642.png differ diff --git a/imgs/renders/643.png b/imgs/renders/643.png index 76f749614..b7352dce8 100644 Binary files a/imgs/renders/643.png and b/imgs/renders/643.png differ diff --git a/imgs/renders/644.png b/imgs/renders/644.png index b0f32d489..67900f05e 100644 Binary files a/imgs/renders/644.png and b/imgs/renders/644.png differ diff --git a/imgs/renders/645.png b/imgs/renders/645.png index b73d4a5fb..7e4b64e11 100644 Binary files a/imgs/renders/645.png and b/imgs/renders/645.png differ diff --git a/imgs/renders/647.png b/imgs/renders/647.png deleted file mode 100644 index 03bccad66..000000000 Binary files a/imgs/renders/647.png and /dev/null differ diff --git a/imgs/renders/648.png b/imgs/renders/648.png index 6e6c2e07c..08fcac2d8 100644 Binary files a/imgs/renders/648.png and b/imgs/renders/648.png differ diff --git a/imgs/renders/649.png b/imgs/renders/649.png index 5f563e5ef..b11ed729c 100644 Binary files a/imgs/renders/649.png and b/imgs/renders/649.png differ diff --git a/imgs/renders/650.png b/imgs/renders/650.png index 3cbc9a066..107b29d05 100644 Binary files a/imgs/renders/650.png and b/imgs/renders/650.png differ diff --git a/imgs/renders/651.png b/imgs/renders/651.png index ac6525bf7..af4452aa6 100644 Binary files a/imgs/renders/651.png and b/imgs/renders/651.png differ diff --git a/imgs/renders/652.png b/imgs/renders/652.png index 8b36a8bb9..628ac7416 100644 Binary files a/imgs/renders/652.png and b/imgs/renders/652.png differ diff --git a/imgs/renders/653.png b/imgs/renders/653.png index 848d2279f..83036c295 100644 Binary files a/imgs/renders/653.png and b/imgs/renders/653.png differ diff --git a/imgs/renders/654.png b/imgs/renders/654.png index 96d5ebbb9..cdd583909 100644 Binary files a/imgs/renders/654.png and b/imgs/renders/654.png differ diff --git a/imgs/renders/655.png b/imgs/renders/655.png index 0fee83438..2e22d069f 100644 Binary files a/imgs/renders/655.png and b/imgs/renders/655.png differ diff --git a/imgs/renders/656.png b/imgs/renders/656.png index 415bf1f90..4b26ae600 100644 Binary files a/imgs/renders/656.png and b/imgs/renders/656.png differ diff --git a/imgs/renders/657.png b/imgs/renders/657.png index 8c7c21f90..3d13e0e23 100644 Binary files a/imgs/renders/657.png and b/imgs/renders/657.png differ diff --git a/imgs/renders/658.png b/imgs/renders/658.png deleted file mode 100644 index 400f3af9f..000000000 Binary files a/imgs/renders/658.png and /dev/null differ diff --git a/imgs/renders/659.png b/imgs/renders/659.png deleted file mode 100644 index 757b4276c..000000000 Binary files a/imgs/renders/659.png and /dev/null differ diff --git a/imgs/renders/660.png b/imgs/renders/660.png deleted file mode 100644 index 12e1db3cf..000000000 Binary files a/imgs/renders/660.png and /dev/null differ diff --git a/imgs/renders/661.png b/imgs/renders/661.png deleted file mode 100644 index 85b4c690f..000000000 Binary files a/imgs/renders/661.png and /dev/null differ diff --git a/imgs/renders/662.png b/imgs/renders/662.png deleted file mode 100644 index 85b4c690f..000000000 Binary files a/imgs/renders/662.png and /dev/null differ diff --git a/imgs/renders/663.png b/imgs/renders/663.png deleted file mode 100644 index 7791cc462..000000000 Binary files a/imgs/renders/663.png and /dev/null differ diff --git a/imgs/renders/664.png b/imgs/renders/664.png deleted file mode 100644 index 85b4c690f..000000000 Binary files a/imgs/renders/664.png and /dev/null differ diff --git a/imgs/renders/665.png b/imgs/renders/665.png deleted file mode 100644 index 85b4c690f..000000000 Binary files a/imgs/renders/665.png and /dev/null differ diff --git a/imgs/renders/666.png b/imgs/renders/666.png deleted file mode 100644 index 85b4c690f..000000000 Binary files a/imgs/renders/666.png and /dev/null differ diff --git a/imgs/renders/667.png b/imgs/renders/667.png deleted file mode 100644 index 7791cc462..000000000 Binary files a/imgs/renders/667.png and /dev/null differ diff --git a/imgs/renders/668.png b/imgs/renders/668.png deleted file mode 100644 index 757b4276c..000000000 Binary files a/imgs/renders/668.png and /dev/null differ diff --git a/imgs/renders/669.png b/imgs/renders/669.png deleted file mode 100644 index 757b4276c..000000000 Binary files a/imgs/renders/669.png and /dev/null differ diff --git a/imgs/renders/670.png b/imgs/renders/670.png deleted file mode 100644 index 2d29fda02..000000000 Binary files a/imgs/renders/670.png and /dev/null differ diff --git a/imgs/renders/671.png b/imgs/renders/671.png index b46e01e38..23db1e7aa 100644 Binary files a/imgs/renders/671.png and b/imgs/renders/671.png differ diff --git a/imgs/renders/672.png b/imgs/renders/672.png index a44ede102..ba94fbcdb 100644 Binary files a/imgs/renders/672.png and b/imgs/renders/672.png differ diff --git a/imgs/renders/9854.png b/imgs/renders/9854.png deleted file mode 100644 index 23c97c9f4..000000000 Binary files a/imgs/renders/9854.png and /dev/null differ diff --git a/imgs/renders/9858.png b/imgs/renders/9858.png deleted file mode 100644 index cb75651bd..000000000 Binary files a/imgs/renders/9858.png and /dev/null differ diff --git a/imgs/renders/9860.png b/imgs/renders/9860.png deleted file mode 100644 index bed3dea30..000000000 Binary files a/imgs/renders/9860.png and /dev/null differ diff --git a/imgs/renders/9862.png b/imgs/renders/9862.png deleted file mode 100644 index 23c97c9f4..000000000 Binary files a/imgs/renders/9862.png and /dev/null differ diff --git a/scripts/conversion.py b/scripts/conversion.py index 5120791d4..9d55f823d 100644 --- a/scripts/conversion.py +++ b/scripts/conversion.py @@ -1,7 +1,5 @@ # Developed for module tiericide, this script will quickly print out a market -# conversion map based on database conversions / renamed modules between two -# eve databases. Correct database conversions must be implemented in upgrade -# script in eos.db.migrations +# conversion map based on patch notes, as well as database conversion mapping. import argparse import os.path @@ -13,7 +11,100 @@ path = os.path.dirname(unicode(__file__, sys.getfilesystemencoding())) sys.path.append(os.path.realpath(os.path.join(path, ".."))) # change to correct conversion -from eos.db.migrations.upgrade4 import CONVERSIONS + +rename_phrase = " is now known as " +conversion_phrase = " has been converted into " + +text = """F-392 Baker Nunn Tracking Disruptor I is now known as Baker Nunn Enduring Tracking Disruptor I +Balmer Series Tracking Disruptor I is now known as Balmer Series Compact Tracking Disruptor I +'Abandon' Tracking Disruptor I is now known as C-IR Compact Guidance Disruptor I +DDO Photometry Tracking Disruptor I is now known as DDO Scoped Tracking Disruptor I +'Distributor' Tracking Disruptor I is now known as 'Distributor' Guidance Disruptor I +5W Infectious Power System Malfunction is now known as Small Infectious Scoped Energy Neutralizer +Small 'Gremlin' Power Core Disruptor I is now known as Small Gremlin Compact Energy Neutralizer +Medium 'Gremlin' Power Core Disruptor I is now known as Medium Gremlin Compact Energy Neutralizer +50W Infectious Power System Malfunction is now known as Medium Infectious Scoped Energy Neutralizer +Heavy 'Gremlin' Power Core Disruptor I is now known as Heavy Gremlin Compact Energy Neutralizer +500W Infectious Power System Malfunction is now known as Heavy Infectious Scoped Energy Neutralizer +'Caltrop' Small Energy Neutralizer I is now known as Small 'Caltrop' Energy Neutralizer +'Ditch' Medium Energy Neutralizer I is now known as Medium 'Ditch' Energy Neutralizer +'Moat' Heavy Energy Neutralizer I is now known as Heavy 'Moat' Energy Neutralizer +Small 'Knave' Energy Drain is now known as Small Knave Scoped Energy Nosferatu +Small 'Ghoul' Energy Siphon I is now known as Small Ghoul Compact Energy Nosferatu +Heavy 'Ghoul' Energy Siphon I is now known as Heavy Ghoul Compact Energy Nosferatu +Heavy 'Knave' Energy Drain is now known as Heavy Knave Scoped Energy Nosferatu +Medium 'Ghoul' Energy Siphon I is now known as Medium Ghoul Compact Energy Nosferatu +Medium 'Knave' Energy Drain is now known as Medium Knave Scoped Energy Nosferatu +'Upir' Small Nosferatu I is now known as Small 'Upir' Energy Nosferatu +'Strigoi' Medium Nosferatu I is now known as Medium 'Strigoi' Energy Nosferatu +'Vrykolakas' Heavy Nosferatu I is now known as Heavy 'Vrykolakas' Energy Nosferatu +M51 Iterative Shield Regenerator is now known as M51 Benefactor Compact Shield Recharger +Basic Shield Power Relay is now known as 'Basic' Shield Power Relay +Type-D Power Core Modification: Shield Power Relay is now known as Type-D Restrained Shield Power Relay +Mark I Generator Refitting: Shield Power Relay is now known as Mark I Compact Shield Power Relay +Basic Shield Flux Coil is now known as 'Basic' Shield Flux Coil +Type-D Power Core Modification: Shield Flux is now known as Type-D Restrained Shield Flux Coil +Mark I Generator Refitting: Shield Flux is now known as Mark I Compact Shield Flux Coil +Micro Remote Shield Booster I is now known as 'Micro' Remote Shield Booster +Capital Murky Remote Shield Booster is now known as CONCORD Capital Remote Shield Booster +Small Murky Remote Shield Booster is now known as Small Murky Compact Remote Shield Booster +Small Asymmetric Remote Shield Booster is now known as Small Asymmetric Enduring Remote Shield Booster +Small S95a Remote Shield Booster is now known as Small S95a Scoped Remote Shield Booster +Medium Murky Remote Shield Booster is now known as Medium Murky Compact Remote Shield Booster +Medium Asymmetric Remote Shield Booster is now known as Medium Asymmetric Enduring Remote Shield Booster +Medium S95a Remote Shield Booster is now known as Medium S95a Scoped Remote Shield Booster +Large Murky Remote Shield Booster is now known as Large Murky Compact Remote Shield Booster +Large Asymmetric Remote Shield Booster is now known as Large Asymmetric Enduring Remote Shield Booster +Large S95a Remote Shield Booster is now known as Large S95a Scoped Remote Shield Booster +Capital Coaxial Remote Armor Repairer is now known as CONCORD Capital Remote Armor Repairer +Small I-ax Remote Armor Repairer is now known as Small I-ax Enduring Remote Armor Repairer +Small Coaxial Remote Armor Repairer is now known as Small Coaxial Compact Remote Armor Repairer +Small 'Solace' Remote Armor Repairer is now known as Small Solace Scoped Remote Armor Repairer +Medium I-ax Remote Armor Repairer is now known as Medium I-ax Enduring Remote Armor Repairer +Medium Coaxial Remote Armor Repairer is now known as Medium Coaxial Compact Remote Armor Repairer +Medium 'Solace' Remote Armor Repairer is now known as Medium Solace Scoped Remote Armor Repairer +Large I-ax Remote Armor Repairer is now known as Large I-ax Enduring Remote Armor Repairer +Large Coaxial Remote Armor Repairer is now known as Large Coaxial Compact Remote Armor Repairer +Large 'Solace' Remote Armor Repairer is now known as Large Solace Scoped Remote Armor Repairer +Small 'Arup' Remote Armor Repairer has been converted into Small Solace Scoped Remote Armor Repairer +'Brotherhood' Small Remote Armor Repairer has been converted into 'Beatnik' Small Remote Armor Repairer +Medium 'Arup' Remote Armor Repairer has been converted into Medium Solace Scoped Remote Armor Repairer +Large 'Arup' Remote Armor Repairer has been converted into Large Solace Scoped Remote Armor Repairer +'Pacifier' Large Remote Armor Repairer has been converted into 'Peace' Large Remote Armor Repairer +Micro Asymmetric Remote Shield Booster has been converted into 'Micro' Remote Shield Booster +Micro Murky Remote Shield Booster has been converted into 'Micro' Remote Shield Booster +Micro 'Atonement' Remote Shield Booster has been converted into 'Micro' Remote Shield Booster +Micro S95a Remote Shield Booster has been converted into 'Micro' Remote Shield Booster +Small 'Atonement' Remote Shield Booster has been converted into Small Murky Compact Remote Shield Booster +Medium 'Atonement' Remote Shield Booster has been converted into Medium Murky Compact Remote Shield Booster +Large 'Atonement' Remote Shield Booster has been converted into Large Murky Compact Remote Shield Booster +E5 Prototype Energy Vampire has been converted into Small Knave Scoped Energy Nosferatu +Small Diminishing Power System Drain I has been converted into Small Ghoul Compact Energy Nosferatu +E50 Prototype Energy Vampire has been converted into Medium Knave Scoped Energy Nosferatu +Medium Diminishing Power System Drain I has been converted into Medium Ghoul Compact Energy Nosferatu +E500 Prototype Energy Vampire has been converted into Heavy Knave Scoped Energy Nosferatu +Heavy Diminishing Power System Drain I has been converted into Heavy Ghoul Compact Energy Nosferatu +Small Rudimentary Energy Destabilizer I has been converted into Small Infectious Scoped Energy Neutralizer +Small Unstable Power Fluctuator I has been converted into Small Gremlin Compact Energy Neutralizer +Medium Rudimentary Energy Destabilizer I has been converted into Medium Infectious Scoped Energy Neutralizer +Medium Unstable Power Fluctuator I has been converted into Medium Gremlin Compact Energy Neutralizer +Heavy Rudimentary Energy Destabilizer I has been converted into Heavy Infectious Scoped Energy Neutralizer +Heavy Unstable Power Fluctuator I has been converted into Heavy Gremlin Compact Energy Neutralizer +Passive Barrier Compensator I has been converted into M51 Benefactor Compact Shield Recharger +'Benefactor' Ward Reconstructor has been converted into M51 Benefactor Compact Shield Recharger +Supplemental Screen Generator I has been converted into M51 Benefactor Compact Shield Recharger +Alpha Reactor Shield Power Relay has been converted into 'Basic' Shield Power Relay +Marked Generator Refitting: Shield Power Relay has been converted into 'Basic' Shield Power Relay +Partial Power Plant Manager: Shield Power Relay has been converted into 'Basic' Shield Power Relay +Type-E Power Core Modification: Shield Power Relay has been converted into 'Basic' Shield Power Relay +Beta Reactor Control: Shield Power Relay I has been converted into Type-D Restrained Shield Power Relay +Local Power Plant Manager: Reaction Shield Power Relay I has been converted into Mark I Compact Shield Power Relay +Alpha Reactor Shield Flux has been converted into 'Basic' Shield Flux Coil +Marked Generator Refitting: Shield Flux has been converted into 'Basic' Shield Flux Coil +Partial Power Plant Manager: Shield Flux has been converted into 'Basic' Shield Flux Coil +Type-E Power Core Modification: Shield Flux has been converted into 'Basic' Shield Flux Coil +Beta Reactor Control: Shield Flux I has been converted into Type-D Restrained Shield Flux Coil +Local Power Plant Manager: Reaction Shield Flux I has been converted into Mark I Compact Shield Flux Coil""" def main(old, new): # Open both databases and get their cursors @@ -22,39 +113,71 @@ def main(old, new): new_db = sqlite3.connect(os.path.expanduser(new)) new_cursor = new_db.cursor() - print "# Renamed items" + renames = {} + conversions = {} - # find renames (stolen from itemDiff) - old_namedata = {} - new_namedata = {} + for x in text.splitlines(): + if conversion_phrase in x: + c = x.split(conversion_phrase) + container = conversions + elif rename_phrase in x: + c = x.split(rename_phrase) + container = renames + else: + print "Unknown format: {}".format(x) + sys.exit() - for cursor, dictionary in ((old_cursor, old_namedata), (new_cursor, new_namedata)): - cursor.execute("SELECT typeID, typeName FROM invtypes") - for row in cursor: - id = row[0] - name = row[1] - dictionary[id] = name + old_name, new_name = c[0], c[1] + old_item, new_item = None, None - for id in set(old_namedata.keys()).intersection(new_namedata.keys()): - oldname = old_namedata[id] - newname = new_namedata[id] - if oldname != newname: - print '"%s": "%s",' % (oldname.encode('utf-8'), newname.encode('utf-8')) - - # Convert modules - print "\n# Converted items" - for replacement_item, list in CONVERSIONS.iteritems(): - new_cursor.execute('SELECT "typeName" FROM "invtypes" WHERE "typeID" = ?', (replacement_item,)) + # gather item info + new_cursor.execute('SELECT "typeID" FROM "invtypes" WHERE "typeName" = ?', (new_name,)) for row in new_cursor: new_item = row[0] break - for retired_item in list: - old_cursor.execute('SELECT "typeName" FROM "invtypes" WHERE "typeID" = ?', (retired_item,)) - for row in old_cursor: - old_item = row[0] - break - print '"%s": "%s",' % (old_item, new_item) + old_cursor.execute('SELECT "typeID" FROM "invtypes" WHERE "typeName" = ?', (old_name,)) + for row in old_cursor: + old_item = row[0] + break + + if not old_item: + print "Error finding old item in {} -> {}".format(old_name, new_name) + if not new_item: + print "Error finding new item in {} -> {}".format(old_name, new_name) + + if not container.get((new_item,new_name), None): + container[(new_item,new_name)] = [] + + + container[(new_item,new_name)].append((old_item, old_name)) + + print " # Renamed items" + + for new, old in renames.iteritems(): + if len(old) != 1: + print "Incorrect length, key: {}, value: {}".format(new, old) + sys.exit() + old = old[0] + + print " \"{}\": \"{}\",".format(old[1], new[1]) + + # Convert modules + print "\n # Converted items" + + for new, olds in conversions.iteritems(): + for old in olds: + print " \"{}\": \"{}\",".format(old[1], new[1]) + + print + print + + for new, old in conversions.iteritems(): + print " {}: ( # {}".format(new[0], new[1]) + for item in old: + print " {}, # {}".format(item[0], item[1]) + print " )," + if __name__ == "__main__": parser = argparse.ArgumentParser() diff --git a/scripts/icons_update.py b/scripts/icons_update.py index 1382b4e67..51c1975c2 100644 --- a/scripts/icons_update.py +++ b/scripts/icons_update.py @@ -142,11 +142,10 @@ for query in (query_items, query_groups, query_cats, query_market, query_attrib) for fname in os.listdir(icons_dir): if not os.path.isfile(os.path.join(icons_dir, fname)): continue - if not fname.startswith('icon') or not fname.endswith('.png'): - continue fname = strip_path(fname) # Get rid of "icon" prefix as well - fname = re.sub('^icon', '', fname) + #fname = re.sub('^icon', '', fname) + print fname,"exists" existing.add(fname) @@ -223,7 +222,7 @@ toadd = needed.difference(existing) if toremove: print('Some icons are not used and will be removed:') for fname in sorted(toremove): - fullname = 'icon{}.png'.format(fname) + fullname = '{}.png'.format(fname) print(' {}'.format(fullname)) fullpath = os.path.join(icons_dir, fullname) os.remove(fullpath) @@ -236,7 +235,7 @@ if toupdate: if icon is None: missing.add(fname) continue - fullname = 'icon{}.png'.format(fname) + fullname = '{}.png'.format(fname) fullpath = os.path.join(icons_dir, fullname) icon.save(fullpath, 'png') if missing: @@ -252,7 +251,7 @@ if toadd: if icon is None: missing.add(fname) continue - fullname = 'icon{}.png'.format(fname) + fullname = '{}.png'.format(fname) fullpath = os.path.join(icons_dir, fullname) icon.save(fullpath, 'png') if missing: diff --git a/service/conversions/releaseDecember15.py b/service/conversions/releaseDecember15.py new file mode 100644 index 000000000..adcd9e552 --- /dev/null +++ b/service/conversions/releaseDecember15.py @@ -0,0 +1,99 @@ +""" +Conversion pack for December 2015 release (no release name) +""" + +CONVERSIONS = { + # Renamed items + "Medium 'Gremlin' Power Core Disruptor I": "Medium Gremlin Compact Energy Neutralizer", + "Medium Coaxial Remote Armor Repairer": "Medium Coaxial Compact Remote Armor Repairer", + "'Distributor' Tracking Disruptor I": "'Distributor' Guidance Disruptor I", + "Type-D Power Core Modification: Shield Flux": "Type-D Restrained Shield Flux Coil", + "Large Coaxial Remote Armor Repairer": "Large Coaxial Compact Remote Armor Repairer", + "Heavy 'Knave' Energy Drain": "Heavy Knave Scoped Energy Nosferatu", + "F-392 Baker Nunn Tracking Disruptor I": "Baker Nunn Enduring Tracking Disruptor I", + "'Ditch' Medium Energy Neutralizer I": "Medium 'Ditch' Energy Neutralizer", + "DDO Photometry Tracking Disruptor I": "DDO Scoped Tracking Disruptor I", + "Small S95a Remote Shield Booster": "Small S95a Scoped Remote Shield Booster", + "Large S95a Remote Shield Booster": "Large S95a Scoped Remote Shield Booster", + "'Abandon' Tracking Disruptor I": "C-IR Compact Guidance Disruptor I", + "500W Infectious Power System Malfunction": "Heavy Infectious Scoped Energy Neutralizer", + "Heavy 'Gremlin' Power Core Disruptor I": "Heavy Gremlin Compact Energy Neutralizer", + "Medium 'Solace' Remote Armor Repairer": "Medium Solace Scoped Remote Armor Repairer", + "Small Coaxial Remote Armor Repairer": "Small Coaxial Compact Remote Armor Repairer", + "Basic Shield Flux Coil": "'Basic' Shield Flux Coil", + "Large I-ax Remote Armor Repairer": "Large I-ax Enduring Remote Armor Repairer", + "Basic Shield Power Relay": "'Basic' Shield Power Relay", + "Capital Coaxial Remote Armor Repairer": "CONCORD Capital Remote Armor Repairer", + "Medium 'Ghoul' Energy Siphon I": "Medium Ghoul Compact Energy Nosferatu", + "Medium S95a Remote Shield Booster": "Medium S95a Scoped Remote Shield Booster", + "Mark I Generator Refitting: Shield Flux": "Mark I Compact Shield Flux Coil", + "Large 'Solace' Remote Armor Repairer": "Large Solace Scoped Remote Armor Repairer", + "Large Asymmetric Remote Shield Booster": "Large Asymmetric Enduring Remote Shield Booster", + "M51 Iterative Shield Regenerator": "M51 Benefactor Compact Shield Recharger", + "Small 'Knave' Energy Drain": "Small Knave Scoped Energy Nosferatu", + "Medium Murky Remote Shield Booster": "Medium Murky Compact Remote Shield Booster", + "Small Murky Remote Shield Booster": "Small Murky Compact Remote Shield Booster", + "Capital Murky Remote Shield Booster": "CONCORD Capital Remote Shield Booster", + "'Caltrop' Small Energy Neutralizer I": "Small 'Caltrop' Energy Neutralizer", + "Small I-ax Remote Armor Repairer": "Small I-ax Enduring Remote Armor Repairer", + "'Vrykolakas' Heavy Nosferatu I": "Heavy 'Vrykolakas' Energy Nosferatu", + "Heavy 'Ghoul' Energy Siphon I": "Heavy Ghoul Compact Energy Nosferatu", + "Small Asymmetric Remote Shield Booster": "Small Asymmetric Enduring Remote Shield Booster", + "Small 'Gremlin' Power Core Disruptor I": "Small Gremlin Compact Energy Neutralizer", + "'Strigoi' Medium Nosferatu I": "Medium 'Strigoi' Energy Nosferatu", + "'Upir' Small Nosferatu I": "Small 'Upir' Energy Nosferatu", + "Balmer Series Tracking Disruptor I": "Balmer Series Compact Tracking Disruptor I", + "Small 'Solace' Remote Armor Repairer": "Small Solace Scoped Remote Armor Repairer", + "'Moat' Heavy Energy Neutralizer I": "Heavy 'Moat' Energy Neutralizer", + "Small 'Ghoul' Energy Siphon I": "Small Ghoul Compact Energy Nosferatu", + "5W Infectious Power System Malfunction": "Small Infectious Scoped Energy Neutralizer", + "50W Infectious Power System Malfunction": "Medium Infectious Scoped Energy Neutralizer", + "Type-D Power Core Modification: Shield Power Relay": "Type-D Restrained Shield Power Relay", + "Micro Remote Shield Booster I": "'Micro' Remote Shield Booster", + "Medium I-ax Remote Armor Repairer": "Medium I-ax Enduring Remote Armor Repairer", + "Medium Asymmetric Remote Shield Booster": "Medium Asymmetric Enduring Remote Shield Booster", + "Large Murky Remote Shield Booster": "Large Murky Compact Remote Shield Booster", + "Medium 'Knave' Energy Drain": "Medium Knave Scoped Energy Nosferatu", + "Mark I Generator Refitting: Shield Power Relay": "Mark I Compact Shield Power Relay", + + # Converted items + "Medium Unstable Power Fluctuator I": "Medium Gremlin Compact Energy Neutralizer", + "'Brotherhood' Small Remote Armor Repairer": "'Beatnik' Small Remote Armor Repairer", + "Beta Reactor Control: Shield Flux I": "Type-D Restrained Shield Flux Coil", + "E500 Prototype Energy Vampire": "Heavy Knave Scoped Energy Nosferatu", + "Heavy Rudimentary Energy Destabilizer I": "Heavy Infectious Scoped Energy Neutralizer", + "Heavy Unstable Power Fluctuator I": "Heavy Gremlin Compact Energy Neutralizer", + "Medium 'Arup' Remote Armor Repairer": "Medium Solace Scoped Remote Armor Repairer", + "Alpha Reactor Shield Flux": "'Basic' Shield Flux Coil", + "Marked Generator Refitting: Shield Flux": "'Basic' Shield Flux Coil", + "Partial Power Plant Manager: Shield Flux": "'Basic' Shield Flux Coil", + "Type-E Power Core Modification: Shield Flux": "'Basic' Shield Flux Coil", + "Alpha Reactor Shield Power Relay": "'Basic' Shield Power Relay", + "Marked Generator Refitting: Shield Power Relay": "'Basic' Shield Power Relay", + "Partial Power Plant Manager: Shield Power Relay": "'Basic' Shield Power Relay", + "Type-E Power Core Modification: Shield Power Relay": "'Basic' Shield Power Relay", + "Small 'Arup' Remote Armor Repairer": "Small Solace Scoped Remote Armor Repairer", + "Medium Diminishing Power System Drain I": "Medium Ghoul Compact Energy Nosferatu", + "Local Power Plant Manager: Reaction Shield Flux I": "Mark I Compact Shield Flux Coil", + "Large 'Arup' Remote Armor Repairer": "Large Solace Scoped Remote Armor Repairer", + "Passive Barrier Compensator I": "M51 Benefactor Compact Shield Recharger", + "'Benefactor' Ward Reconstructor": "M51 Benefactor Compact Shield Recharger", + "Supplemental Screen Generator I": "M51 Benefactor Compact Shield Recharger", + "E5 Prototype Energy Vampire": "Small Knave Scoped Energy Nosferatu", + "Medium 'Atonement' Remote Shield Booster": "Medium Murky Compact Remote Shield Booster", + "Small 'Atonement' Remote Shield Booster": "Small Murky Compact Remote Shield Booster", + "Heavy Diminishing Power System Drain I": "Heavy Ghoul Compact Energy Nosferatu", + "Small Unstable Power Fluctuator I": "Small Gremlin Compact Energy Neutralizer", + "Local Power Plant Manager: Reaction Shield Power Relay I": "Mark I Compact Shield Power Relay", + "'Pacifier' Large Remote Armor Repairer": "'Peace' Large Remote Armor Repairer", + "Small Diminishing Power System Drain I": "Small Ghoul Compact Energy Nosferatu", + "Small Rudimentary Energy Destabilizer I": "Small Infectious Scoped Energy Neutralizer", + "Medium Rudimentary Energy Destabilizer I": "Medium Infectious Scoped Energy Neutralizer", + "Beta Reactor Control: Shield Power Relay I": "Type-D Restrained Shield Power Relay", + "Micro Asymmetric Remote Shield Booster": "'Micro' Remote Shield Booster", + "Micro Murky Remote Shield Booster": "'Micro' Remote Shield Booster", + "Micro 'Atonement' Remote Shield Booster": "'Micro' Remote Shield Booster", + "Micro S95a Remote Shield Booster": "'Micro' Remote Shield Booster", + "Large 'Atonement' Remote Shield Booster": "Large Murky Compact Remote Shield Booster", + "E50 Prototype Energy Vampire": "Medium Knave Scoped Energy Nosferatu", +} \ No newline at end of file