diff --git a/eos/effects/armorrepairprojectormaxrangebonus.py b/eos/effects/armorrepairprojectormaxrangebonus.py index 91757daba..a9d8288cb 100755 --- a/eos/effects/armorrepairprojectormaxrangebonus.py +++ b/eos/effects/armorrepairprojectormaxrangebonus.py @@ -5,5 +5,5 @@ # Ship: Navitas type = "passive" def handler(fit, ship, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Repair Projector", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer", "maxRange", ship.getModifiedItemAttr("maxRangeBonus")) diff --git a/eos/effects/carrierminmatararmorshieldamount.py b/eos/effects/carrierminmatararmorshieldamount.py index 9990a5dc2..f94bc1a5e 100755 --- a/eos/effects/carrierminmatararmorshieldamount.py +++ b/eos/effects/carrierminmatararmorshieldamount.py @@ -4,7 +4,7 @@ type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Minmatar Carrier").level - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Shield Transporter", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Shield Booster", "shieldBonus", ship.getModifiedItemAttr("carrierMinmatarBonus2") * level) - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Repair Projector", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer", "armorDamageAmount", ship.getModifiedItemAttr("carrierMinmatarBonus2") * level) diff --git a/eos/effects/elitebonuslogisticenergytransfercapneed1.py b/eos/effects/elitebonuslogisticenergytransfercapneed1.py index 55b3f9a4f..fc56e7af7 100755 --- a/eos/effects/elitebonuslogisticenergytransfercapneed1.py +++ b/eos/effects/elitebonuslogisticenergytransfercapneed1.py @@ -3,5 +3,5 @@ type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Logistics").level - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Transfer Array", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Capacitor Transmitter", "capacitorNeed", ship.getModifiedItemAttr("eliteBonusLogistics1") * level) diff --git a/eos/effects/elitebonuslogisticenergytransfercapneed2.py b/eos/effects/elitebonuslogisticenergytransfercapneed2.py index 2577e2bce..fb9d533f9 100755 --- a/eos/effects/elitebonuslogisticenergytransfercapneed2.py +++ b/eos/effects/elitebonuslogisticenergytransfercapneed2.py @@ -4,5 +4,5 @@ type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Logistics").level - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Transfer Array", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Capacitor Transmitter", "capacitorNeed", ship.getModifiedItemAttr("eliteBonusLogistics2") * level) diff --git a/eos/effects/elitebonuslogisticremotearmorrepaircapneed1.py b/eos/effects/elitebonuslogisticremotearmorrepaircapneed1.py index 21bc21c2a..ad233c527 100755 --- a/eos/effects/elitebonuslogisticremotearmorrepaircapneed1.py +++ b/eos/effects/elitebonuslogisticremotearmorrepaircapneed1.py @@ -3,5 +3,5 @@ type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Logistics").level - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Repair Projector", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer", "capacitorNeed", ship.getModifiedItemAttr("eliteBonusLogistics1") * level) diff --git a/eos/effects/elitebonuslogisticremotearmorrepaircapneed2.py b/eos/effects/elitebonuslogisticremotearmorrepaircapneed2.py index a42cc11a1..c067be5e0 100755 --- a/eos/effects/elitebonuslogisticremotearmorrepaircapneed2.py +++ b/eos/effects/elitebonuslogisticremotearmorrepaircapneed2.py @@ -3,5 +3,5 @@ type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Logistics").level - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Repair Projector", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer", "capacitorNeed", ship.getModifiedItemAttr("eliteBonusLogistics2") * level) diff --git a/eos/effects/elitebonuslogisticshieldtransfercapneed1.py b/eos/effects/elitebonuslogisticshieldtransfercapneed1.py index 998cd3909..bd257088f 100755 --- a/eos/effects/elitebonuslogisticshieldtransfercapneed1.py +++ b/eos/effects/elitebonuslogisticshieldtransfercapneed1.py @@ -4,5 +4,5 @@ type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Logistics").level - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Shield Transporter", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Shield Booster", "capacitorNeed", ship.getModifiedItemAttr("eliteBonusLogistics1") * level) diff --git a/eos/effects/elitebonuslogisticshieldtransfercapneed2.py b/eos/effects/elitebonuslogisticshieldtransfercapneed2.py index 64360d2e7..060f2a833 100755 --- a/eos/effects/elitebonuslogisticshieldtransfercapneed2.py +++ b/eos/effects/elitebonuslogisticshieldtransfercapneed2.py @@ -3,5 +3,5 @@ type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Logistics").level - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Shield Transporter", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Shield Booster", "capacitorNeed", ship.getModifiedItemAttr("eliteBonusLogistics2") * level) diff --git a/eos/effects/elitebonuslogisticstrackinglinkfalloffbonus1.py b/eos/effects/elitebonuslogisticstrackinglinkfalloffbonus1.py index 26bac2307..86d3a6285 100755 --- a/eos/effects/elitebonuslogisticstrackinglinkfalloffbonus1.py +++ b/eos/effects/elitebonuslogisticstrackinglinkfalloffbonus1.py @@ -3,5 +3,5 @@ type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Logistics").level - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tracking Link", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer", "falloffBonus", ship.getModifiedItemAttr("eliteBonusLogistics1") * level) diff --git a/eos/effects/elitebonuslogisticstrackinglinkfalloffbonus2.py b/eos/effects/elitebonuslogisticstrackinglinkfalloffbonus2.py index 0a2ca01c6..c3abcd699 100755 --- a/eos/effects/elitebonuslogisticstrackinglinkfalloffbonus2.py +++ b/eos/effects/elitebonuslogisticstrackinglinkfalloffbonus2.py @@ -3,5 +3,5 @@ type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Logistics").level - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tracking Link", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer", "falloffBonus", ship.getModifiedItemAttr("eliteBonusLogistics2") * level) diff --git a/eos/effects/elitebonuslogisticstrackinglinkmaxrangebonus1.py b/eos/effects/elitebonuslogisticstrackinglinkmaxrangebonus1.py index 2d259cb28..c11203d2e 100755 --- a/eos/effects/elitebonuslogisticstrackinglinkmaxrangebonus1.py +++ b/eos/effects/elitebonuslogisticstrackinglinkmaxrangebonus1.py @@ -3,5 +3,5 @@ type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Logistics").level - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tracking Link", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer", "maxRangeBonus", ship.getModifiedItemAttr("eliteBonusLogistics1") * level) diff --git a/eos/effects/elitebonuslogisticstrackinglinkmaxrangebonus2.py b/eos/effects/elitebonuslogisticstrackinglinkmaxrangebonus2.py index 668a9e846..a7d771eaa 100755 --- a/eos/effects/elitebonuslogisticstrackinglinkmaxrangebonus2.py +++ b/eos/effects/elitebonuslogisticstrackinglinkmaxrangebonus2.py @@ -3,5 +3,5 @@ type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Logistics").level - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tracking Link", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer", "maxRangeBonus", ship.getModifiedItemAttr("eliteBonusLogistics2") * level) diff --git a/eos/effects/elitebonuslogisticstrackinglinktrackingspeedbonus1.py b/eos/effects/elitebonuslogisticstrackinglinktrackingspeedbonus1.py index 7b97fb28b..eebaf0c98 100755 --- a/eos/effects/elitebonuslogisticstrackinglinktrackingspeedbonus1.py +++ b/eos/effects/elitebonuslogisticstrackinglinktrackingspeedbonus1.py @@ -3,5 +3,5 @@ type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Logistics").level - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tracking Link", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer", "trackingSpeedBonus", ship.getModifiedItemAttr("eliteBonusLogistics1") * level) diff --git a/eos/effects/elitebonuslogisticstrackinglinktrackingspeedbonus2.py b/eos/effects/elitebonuslogisticstrackinglinktrackingspeedbonus2.py index 8b36b982b..40f761e8f 100755 --- a/eos/effects/elitebonuslogisticstrackinglinktrackingspeedbonus2.py +++ b/eos/effects/elitebonuslogisticstrackinglinktrackingspeedbonus2.py @@ -3,5 +3,5 @@ type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Logistics").level - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tracking Link", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer", "trackingSpeedBonus", ship.getModifiedItemAttr("eliteBonusLogistics2") * level) diff --git a/eos/effects/energyemmisionsystemscapneedbonuspostpercentcapacitorneedlocationshipmodulesrequiringenergyemmisionsystems.py b/eos/effects/energyemmisionsystemscapneedbonuspostpercentcapacitorneedlocationshipmodulesrequiringenergyemmisionsystems.py index ff17bcbbb..31601ad9f 100755 --- a/eos/effects/energyemmisionsystemscapneedbonuspostpercentcapacitorneedlocationshipmodulesrequiringenergyemmisionsystems.py +++ b/eos/effects/energyemmisionsystemscapneedbonuspostpercentcapacitorneedlocationshipmodulesrequiringenergyemmisionsystems.py @@ -5,5 +5,5 @@ type = "passive" def handler(fit, container, context): level = container.level if "skill" in context else 1 - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Energy Emission Systems"), + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capacitor Emission Systems"), "capacitorNeed", container.getModifiedItemAttr("capNeedBonus") * level) diff --git a/eos/effects/energytransferarraymaxrangebonus.py b/eos/effects/energytransferarraymaxrangebonus.py index dca541353..d6e1d8583 100755 --- a/eos/effects/energytransferarraymaxrangebonus.py +++ b/eos/effects/energytransferarraymaxrangebonus.py @@ -3,5 +3,5 @@ # Ship: Osprey type = "passive" def handler(fit, ship, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Transfer Array", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Capacitor Transmitter", "powerTransferRange", ship.getModifiedItemAttr("maxRangeBonus")) diff --git a/eos/effects/energytransferarraytransferamountbonus.py b/eos/effects/energytransferarraytransferamountbonus.py index 22ac3fd0b..08450908b 100755 --- a/eos/effects/energytransferarraytransferamountbonus.py +++ b/eos/effects/energytransferarraytransferamountbonus.py @@ -3,5 +3,5 @@ # Ship: Osprey type = "passive" def handler(fit, ship, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Transfer Array", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Capacitor Transmitter", "powerTransferAmount", ship.getModifiedItemAttr("energyTransferAmountBonus")) diff --git a/eos/effects/energytransferpowerneedbonuseffect.py b/eos/effects/energytransferpowerneedbonuseffect.py index 2be09991c..134309e4f 100755 --- a/eos/effects/energytransferpowerneedbonuseffect.py +++ b/eos/effects/energytransferpowerneedbonuseffect.py @@ -2,5 +2,5 @@ # Ships from group: Logistics (3 of 5) type = "passive" def handler(fit, ship, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Transfer Array", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Capacitor Transmitter", "power", ship.getModifiedItemAttr("powerTransferPowerNeedBonus")) diff --git a/eos/effects/remotearmorpowerneedbonuseffect.py b/eos/effects/remotearmorpowerneedbonuseffect.py index 901209a52..69f79b2d6 100755 --- a/eos/effects/remotearmorpowerneedbonuseffect.py +++ b/eos/effects/remotearmorpowerneedbonuseffect.py @@ -3,5 +3,5 @@ # Ship: Oneiros type = "passive" def handler(fit, ship, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Repair Projector", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer", "power", ship.getModifiedItemAttr("remoteArmorPowerNeedBonus")) diff --git a/eos/effects/setbonusbloodraidernosferatu.py b/eos/effects/setbonusbloodraidernosferatu.py index b542671be..b61393109 100755 --- a/eos/effects/setbonusbloodraidernosferatu.py +++ b/eos/effects/setbonusbloodraidernosferatu.py @@ -2,5 +2,5 @@ # Implants named like: Talisman (10 of 12) type = "passive" def handler(fit, implant, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Energy Emission Systems"), - "duration", implant.getModifiedItemAttr("durationBonus")) \ No newline at end of file + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capacitor Emission Systems"), + "duration", implant.getModifiedItemAttr("durationBonus")) diff --git a/eos/effects/shieldtransportcpuneedbonuseffect.py b/eos/effects/shieldtransportcpuneedbonuseffect.py index 6c0529471..9eb91a65c 100755 --- a/eos/effects/shieldtransportcpuneedbonuseffect.py +++ b/eos/effects/shieldtransportcpuneedbonuseffect.py @@ -2,5 +2,5 @@ # Ships from group: Logistics (3 of 5) type = "passive" def handler(fit, ship, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Shield Transporter", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Shield Booster", "cpu", ship.getModifiedItemAttr("shieldTransportCpuNeedBonus")) diff --git a/eos/effects/shieldtransportermaxrangebonus.py b/eos/effects/shieldtransportermaxrangebonus.py index d7abd5088..6a2b65c37 100755 --- a/eos/effects/shieldtransportermaxrangebonus.py +++ b/eos/effects/shieldtransportermaxrangebonus.py @@ -5,5 +5,5 @@ # Ship: Scythe type = "passive" def handler(fit, ship, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Shield Transporter", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Shield Booster", "shieldTransferRange", ship.getModifiedItemAttr("maxRangeBonus")) diff --git a/eos/effects/shipbonusremotearmorrepairamount2af.py b/eos/effects/shipbonusremotearmorrepairamount2af.py index 07359407f..a065a60f0 100755 --- a/eos/effects/shipbonusremotearmorrepairamount2af.py +++ b/eos/effects/shipbonusremotearmorrepairamount2af.py @@ -3,5 +3,5 @@ type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Amarr Frigate").level - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Repair Projector", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer", "armorDamageAmount", ship.getModifiedItemAttr("shipBonus2AF") * level) diff --git a/eos/effects/shipbonusremotearmorrepairamountac2.py b/eos/effects/shipbonusremotearmorrepairamountac2.py index f316cbbd6..da021a4f4 100755 --- a/eos/effects/shipbonusremotearmorrepairamountac2.py +++ b/eos/effects/shipbonusremotearmorrepairamountac2.py @@ -3,5 +3,5 @@ type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Amarr Cruiser").level - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Repair Projector", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer", "armorDamageAmount", ship.getModifiedItemAttr("shipBonusAC2") * level) diff --git a/eos/effects/shipbonusremotearmorrepairamountgc2.py b/eos/effects/shipbonusremotearmorrepairamountgc2.py index d678a8779..74a02054c 100755 --- a/eos/effects/shipbonusremotearmorrepairamountgc2.py +++ b/eos/effects/shipbonusremotearmorrepairamountgc2.py @@ -3,5 +3,5 @@ type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Cruiser").level - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Repair Projector", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer", "armorDamageAmount", ship.getModifiedItemAttr("shipBonusGC2") * level) diff --git a/eos/effects/shipbonusremotearmorrepairamountgf2.py b/eos/effects/shipbonusremotearmorrepairamountgf2.py index dc9575422..f79b4a650 100755 --- a/eos/effects/shipbonusremotearmorrepairamountgf2.py +++ b/eos/effects/shipbonusremotearmorrepairamountgf2.py @@ -3,5 +3,5 @@ type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Frigate").level - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Repair Projector", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer", "armorDamageAmount", ship.getModifiedItemAttr("shipBonusGF2") * level) diff --git a/eos/effects/shipbonusremotearmorrepaircapneedac1.py b/eos/effects/shipbonusremotearmorrepaircapneedac1.py index c3d12bb66..e73ec9f60 100755 --- a/eos/effects/shipbonusremotearmorrepaircapneedac1.py +++ b/eos/effects/shipbonusremotearmorrepaircapneedac1.py @@ -3,5 +3,5 @@ type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Amarr Cruiser").level - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Repair Projector", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer", "capacitorNeed", ship.getModifiedItemAttr("shipBonusAC") * level) diff --git a/eos/effects/shipbonusremotearmorrepaircapneedaf.py b/eos/effects/shipbonusremotearmorrepaircapneedaf.py index 756e970f9..0b88c3b45 100755 --- a/eos/effects/shipbonusremotearmorrepaircapneedaf.py +++ b/eos/effects/shipbonusremotearmorrepaircapneedaf.py @@ -3,5 +3,5 @@ type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Amarr Frigate").level - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Repair Projector", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer", "capacitorNeed", ship.getModifiedItemAttr("shipBonusAF") * level) diff --git a/eos/effects/shipbonusremotearmorrepaircapneedgc1.py b/eos/effects/shipbonusremotearmorrepaircapneedgc1.py index 163b8be6a..8ce1a62af 100755 --- a/eos/effects/shipbonusremotearmorrepaircapneedgc1.py +++ b/eos/effects/shipbonusremotearmorrepaircapneedgc1.py @@ -3,5 +3,5 @@ type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Cruiser").level - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Repair Projector", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer", "capacitorNeed", ship.getModifiedItemAttr("shipBonusGC") * level) diff --git a/eos/effects/shipbonusremotearmorrepaircapneedgf.py b/eos/effects/shipbonusremotearmorrepaircapneedgf.py index 75c8dc8a3..3f52edbfa 100755 --- a/eos/effects/shipbonusremotearmorrepaircapneedgf.py +++ b/eos/effects/shipbonusremotearmorrepaircapneedgf.py @@ -3,5 +3,5 @@ type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Frigate").level - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Repair Projector", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer", "capacitorNeed", ship.getModifiedItemAttr("shipBonusGF") * level) diff --git a/eos/effects/shipbonusshieldtransfercapneed1.py b/eos/effects/shipbonusshieldtransfercapneed1.py index 476795299..eb1d31759 100755 --- a/eos/effects/shipbonusshieldtransfercapneed1.py +++ b/eos/effects/shipbonusshieldtransfercapneed1.py @@ -3,5 +3,5 @@ type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Cruiser").level - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Shield Transporter", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Shield Booster", "capacitorNeed", ship.getModifiedItemAttr("shipBonusCC") * level) diff --git a/eos/effects/shipenergytransferrange1.py b/eos/effects/shipenergytransferrange1.py index 1f03a1f52..cc5612d93 100755 --- a/eos/effects/shipenergytransferrange1.py +++ b/eos/effects/shipenergytransferrange1.py @@ -3,5 +3,5 @@ type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Amarr Cruiser").level - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Transfer Array", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Capacitor Transmitter", "powerTransferRange", ship.getModifiedItemAttr("shipBonusAC") * level) diff --git a/eos/effects/shipenergytransferrange2.py b/eos/effects/shipenergytransferrange2.py index ada260525..3cfd0cc2e 100755 --- a/eos/effects/shipenergytransferrange2.py +++ b/eos/effects/shipenergytransferrange2.py @@ -4,5 +4,5 @@ type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Cruiser").level - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Transfer Array", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Capacitor Transmitter", "powerTransferRange", ship.getModifiedItemAttr("shipBonusCC2") * level) diff --git a/eos/effects/shipremotearmorrange1.py b/eos/effects/shipremotearmorrange1.py index 3035d9545..7effc0cf9 100755 --- a/eos/effects/shipremotearmorrange1.py +++ b/eos/effects/shipremotearmorrange1.py @@ -3,5 +3,5 @@ type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Cruiser").level - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Repair Projector", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer", "maxRange", ship.getModifiedItemAttr("shipBonusGC") * level) \ No newline at end of file diff --git a/eos/effects/shipremotearmorrange2.py b/eos/effects/shipremotearmorrange2.py index c4506d5f8..4aa2fdd46 100755 --- a/eos/effects/shipremotearmorrange2.py +++ b/eos/effects/shipremotearmorrange2.py @@ -3,5 +3,5 @@ type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Amarr Cruiser").level - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Repair Projector", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer", "maxRange", ship.getModifiedItemAttr("shipBonusAC2") * level) diff --git a/eos/effects/shipshieldtransferrange1.py b/eos/effects/shipshieldtransferrange1.py index 5c9090bc2..50f942eaf 100755 --- a/eos/effects/shipshieldtransferrange1.py +++ b/eos/effects/shipshieldtransferrange1.py @@ -4,5 +4,5 @@ type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Cruiser").level - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Shield Transporter", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Shield Booster", "shieldTransferRange", ship.getModifiedItemAttr("shipBonusCC") * level) diff --git a/eos/effects/shipshieldtransferrange2.py b/eos/effects/shipshieldtransferrange2.py index 8a41c5ed5..019f0ccdc 100755 --- a/eos/effects/shipshieldtransferrange2.py +++ b/eos/effects/shipshieldtransferrange2.py @@ -3,5 +3,5 @@ type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Minmatar Cruiser").level - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Shield Transporter", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Shield Booster", "shieldTransferRange", ship.getModifiedItemAttr("shipBonusMC2") * level) diff --git a/eos/effects/shiptrackinglinkrange1fixed.py b/eos/effects/shiptrackinglinkrange1fixed.py index 286c6b463..f5a80eb3d 100755 --- a/eos/effects/shiptrackinglinkrange1fixed.py +++ b/eos/effects/shiptrackinglinkrange1fixed.py @@ -3,5 +3,5 @@ type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Minmatar Cruiser").level - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tracking Link", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer", "maxRange", ship.getModifiedItemAttr("shipBonusMC") * level) diff --git a/eos/effects/shiptrackinglinkrange2group.py b/eos/effects/shiptrackinglinkrange2group.py index 766277ea1..a8231c6d4 100755 --- a/eos/effects/shiptrackinglinkrange2group.py +++ b/eos/effects/shiptrackinglinkrange2group.py @@ -3,5 +3,5 @@ type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Cruiser").level - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tracking Link", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer", "maxRange", ship.getModifiedItemAttr("shipBonusGC2") * level) diff --git a/eos/effects/subsystembonusamarrdefensive2remotearmorrepairamount.py b/eos/effects/subsystembonusamarrdefensive2remotearmorrepairamount.py index 0dad44c93..7208d9377 100755 --- a/eos/effects/subsystembonusamarrdefensive2remotearmorrepairamount.py +++ b/eos/effects/subsystembonusamarrdefensive2remotearmorrepairamount.py @@ -3,5 +3,5 @@ type = "passive" def handler(fit, module, context): level = fit.character.getSkill("Amarr Defensive Systems").level - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Repair Projector", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer", "armorDamageAmount", module.getModifiedItemAttr("subsystemBonusAmarrDefensive2") * level) diff --git a/eos/effects/subsystembonuscaldaridefensive2remoteshieldtransporteramount.py b/eos/effects/subsystembonuscaldaridefensive2remoteshieldtransporteramount.py index 99d424e3e..42f75cb03 100755 --- a/eos/effects/subsystembonuscaldaridefensive2remoteshieldtransporteramount.py +++ b/eos/effects/subsystembonuscaldaridefensive2remoteshieldtransporteramount.py @@ -3,5 +3,5 @@ type = "passive" def handler(fit, module, context): level = fit.character.getSkill("Caldari Defensive Systems").level - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Shield Transporter", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Shield Booster", "shieldBonus", module.getModifiedItemAttr("subsystemBonusCaldariDefensive2") * level) diff --git a/eos/effects/subsystembonusgallentedefensive2remotearmorrepairamount.py b/eos/effects/subsystembonusgallentedefensive2remotearmorrepairamount.py index 4255cb29c..b3dc2f6b0 100755 --- a/eos/effects/subsystembonusgallentedefensive2remotearmorrepairamount.py +++ b/eos/effects/subsystembonusgallentedefensive2remotearmorrepairamount.py @@ -3,5 +3,5 @@ type = "passive" def handler(fit, module, context): level = fit.character.getSkill("Gallente Defensive Systems").level - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Repair Projector", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer", "armorDamageAmount", module.getModifiedItemAttr("subsystemBonusGallenteDefensive2") * level) diff --git a/eos/effects/subsystembonusminmatardefensive2remoteshieldtransporteramount.py b/eos/effects/subsystembonusminmatardefensive2remoteshieldtransporteramount.py index 6a227efdf..786c797f5 100755 --- a/eos/effects/subsystembonusminmatardefensive2remoteshieldtransporteramount.py +++ b/eos/effects/subsystembonusminmatardefensive2remoteshieldtransporteramount.py @@ -3,5 +3,5 @@ type = "passive" def handler(fit, module, context): level = fit.character.getSkill("Minmatar Defensive Systems").level - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Shield Transporter", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Shield Booster", "shieldBonus", module.getModifiedItemAttr("subsystemBonusMinmatarDefensive2") * level) diff --git a/eos/effects/surveyscanspeedbonuspostpercentdurationlocationshipmodulesrequiringelectronics.py b/eos/effects/surveyscanspeedbonuspostpercentdurationlocationshipmodulesrequiringelectronics.py index bf713b7b6..9064736bd 100755 --- a/eos/effects/surveyscanspeedbonuspostpercentdurationlocationshipmodulesrequiringelectronics.py +++ b/eos/effects/surveyscanspeedbonuspostpercentdurationlocationshipmodulesrequiringelectronics.py @@ -4,5 +4,5 @@ type = "passive" def handler(fit, container, context): level = container.level if "skill" in context else 1 - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Electronics"), + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("CPU Management"), "duration", container.getModifiedItemAttr("scanspeedBonus") * level) diff --git a/eos/effects/systemarmorremoterepairamount.py b/eos/effects/systemarmorremoterepairamount.py index 6f117214f..8946bc20f 100755 --- a/eos/effects/systemarmorremoterepairamount.py +++ b/eos/effects/systemarmorremoterepairamount.py @@ -3,5 +3,5 @@ runTime = "early" type = ("projected", "offline") def handler(fit, module, context): - fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Armor Repair Projector", + fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Remote Armor Repairer", "armorDamageAmount", module.getModifiedItemAttr("armorDamageAmountMultiplierRemote")) diff --git a/eos/effects/systemshieldremoterepairamount.py b/eos/effects/systemshieldremoterepairamount.py index 77a4a420f..118ce90d4 100755 --- a/eos/effects/systemshieldremoterepairamount.py +++ b/eos/effects/systemshieldremoterepairamount.py @@ -3,5 +3,5 @@ runTime = "early" type = ("projected", "offline") def handler(fit, module, context): - fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Shield Transporter", + fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Remote Shield Booster", "shieldBonus", module.getModifiedItemAttr("shieldBonusMultiplierRemote")) diff --git a/eos/saveddata/fit.py b/eos/saveddata/fit.py index 115f85dde..3167c7c91 100755 --- a/eos/saveddata/fit.py +++ b/eos/saveddata/fit.py @@ -950,15 +950,15 @@ class Fit(object): "Hull Repair Unit": "structureDamageAmount", "Shield Booster": "shieldBonus", "Fueled Shield Booster": "shieldBonus", - "Armor Repair Projector": "armorDamageAmount", - "Shield Transporter": "shieldBonus"} + "Remote Armor Repairer": "armorDamageAmount", + "Remote Shield Booster": "shieldBonus"} #Map repairer type to attribute groupStoreMap = {"Armor Repair Unit": "armorRepair", "Hull Repair Unit": "hullRepair", "Shield Booster": "shieldRepair", "Fueled Shield Booster": "shieldRepair", - "Armor Repair Projector": "armorRepair", - "Shield Transporter": "shieldRepair", + "Remote Armor Repairer": "armorRepair", + "Remote Shield Booster": "shieldRepair", "Fueled Armor Repairer": "armorRepair",} capUsed = self.capUsed diff --git a/gui/builtinViewColumns/misc.py b/gui/builtinViewColumns/misc.py index 3e7baa114..0a5cc5e14 100644 --- a/gui/builtinViewColumns/misc.py +++ b/gui/builtinViewColumns/misc.py @@ -242,7 +242,7 @@ class Miscellanea(ViewColumn): text = "{0}s".format(formatAmount(float(recalibration)/1000, 3, 0, 3)) tooltip = "Sensor recalibration time" return text, tooltip - elif itemGroup == "Armor Repair Projector": + elif itemGroup == "Remote Armor Repairer": repAmount = stuff.getModifiedItemAttr("armorDamageAmount") cycleTime = stuff.getModifiedItemAttr("duration") if not repAmount or not cycleTime: @@ -251,7 +251,7 @@ class Miscellanea(ViewColumn): text = "{0}/s".format(formatAmount(repPerSec, 3, 0, 3, forceSign=True)) tooltip = "Armor repaired per second" return text, tooltip - elif itemGroup == "Shield Transporter": + elif itemGroup == "Remote Shield Booster": repAmount = stuff.getModifiedItemAttr("shieldBonus") cycleTime = stuff.cycleTime if not repAmount or not cycleTime: @@ -260,7 +260,7 @@ class Miscellanea(ViewColumn): text = "{0}/s".format(formatAmount(repPerSec, 3, 0, 3, forceSign=True)) tooltip = "Shield transferred per second" return text, tooltip - elif itemGroup == "Energy Transfer Array": + elif itemGroup == "Remote Capacitor Transmitter": repAmount = stuff.getModifiedItemAttr("powerTransferAmount") cycleTime = stuff.cycleTime if not repAmount or not cycleTime: diff --git a/service/market.py b/service/market.py index a8ac58bc2..b80f14303 100644 --- a/service/market.py +++ b/service/market.py @@ -213,9 +213,9 @@ class Market(): "Sukuuvestaa Heron": False, # Vanity "Inner Zone Shipping Imicus": False, # Vanity "Vherokior Probe": False, # Vanity - "Iteron Mark IV Quafe Ultra Edition": False, # Vanity - "Iteron Mark IV Quafe Ultramarine Edition": False, # Vanity - "Iteron Mark IV Amastris Edition": False, # Vanity + "Miasmos Quafe Ultra Edition": False, # Vanity + "Miasmos Quafe Ultramarine Edition": False, # Vanity + "Miasmos Amastris Edition": False, # Vanity "Goru's Shuttle": False, # Vanity "Guristas Shuttle": False, # Vanity "Tash-Murkon Magnate": False, # Vanity @@ -257,9 +257,9 @@ class Market(): "Civilian Hobgoblin": 837, # Drones > Combat Drones > Light Scout Drones "Civilian Kinetic Deflection Field": 760, # Ship Equipment > Civilian Modules "Civilian Light Missile Launcher": 760, # Ship Equipment > Civilian Modules - "Civilian Remote Armor Repair System": 760, # Ship Equipment > Civilian Modules - "Civilian Remote Shield Transporter": 760, # Ship Equipment > Civilian Modules "Civilian Scourge Light Missile": 920, # Ammunition & Charges > Missiles > Light Missiles > Standard Light Missiles + "Civilian Small Remote Armor Repairer": 760, # Ship Equipment > Civilian Modules + "Civilian Small Remote Shield Booster": 760, # Ship Equipment > Civilian Modules "Civilian Stasis Webifier": 760, # Ship Equipment > Civilian Modules "Civilian Thermic Dissipation Field": 760, # Ship Equipment > Civilian Modules "Civilian Warp Disruptor": 760, # Ship Equipment > Civilian Modules