diff --git a/eos/effects/addtosignatureradius2.py b/eos/effects/addtosignatureradius2.py index 550357bfc..6c790a925 100644 --- a/eos/effects/addtosignatureradius2.py +++ b/eos/effects/addtosignatureradius2.py @@ -2,7 +2,7 @@ # # Used by: # Modules from group: Missile Launcher Bomb (2 of 2) -# Modules from group: Shield Extender (33 of 33) +# Modules from group: Shield Extender (36 of 36) type = "passive" diff --git a/eos/effects/ammoinfluencecapneed.py b/eos/effects/ammoinfluencecapneed.py index b798f0f4b..1ab51fc20 100644 --- a/eos/effects/ammoinfluencecapneed.py +++ b/eos/effects/ammoinfluencecapneed.py @@ -1,7 +1,7 @@ # ammoInfluenceCapNeed # # Used by: -# Items from category: Charge (478 of 928) +# Items from category: Charge (493 of 943) type = "passive" diff --git a/eos/effects/ammoinfluencerange.py b/eos/effects/ammoinfluencerange.py index 078b2b205..04570e7f5 100644 --- a/eos/effects/ammoinfluencerange.py +++ b/eos/effects/ammoinfluencerange.py @@ -1,7 +1,7 @@ # ammoInfluenceRange # # Used by: -# Items from category: Charge (572 of 928) +# Items from category: Charge (587 of 943) type = "passive" diff --git a/eos/effects/ammotrackingmultiplier.py b/eos/effects/ammotrackingmultiplier.py index 0cea10c80..07d95a8d7 100644 --- a/eos/effects/ammotrackingmultiplier.py +++ b/eos/effects/ammotrackingmultiplier.py @@ -5,6 +5,7 @@ # Charges from group: Advanced Autocannon Ammo (8 of 8) # Charges from group: Advanced Beam Laser Crystal (8 of 8) # Charges from group: Advanced Blaster Charge (8 of 8) +# Charges from group: Advanced Charge Bottle (5 of 6) # Charges from group: Advanced Pulse Laser Crystal (8 of 8) # Charges from group: Advanced Railgun Charge (8 of 8) # Charges from group: Projectile Ammo (128 of 128) diff --git a/eos/effects/armorallrepairsystemsamountbonuspassive.py b/eos/effects/armorallrepairsystemsamountbonuspassive.py index c5162f3e0..aff4d61e2 100644 --- a/eos/effects/armorallrepairsystemsamountbonuspassive.py +++ b/eos/effects/armorallrepairsystemsamountbonuspassive.py @@ -1,6 +1,7 @@ # armorAllRepairSystemsAmountBonusPassive # # Used by: +# Implants named like: Agency 'Hardshell' TB Dose (3 of 3) # Implants named like: Exile Booster (4 of 4) # Implant: Antipharmakon Kosybo type = "passive" diff --git a/eos/effects/armorhpbonusadd.py b/eos/effects/armorhpbonusadd.py index 591e1cc58..f965b45ae 100644 --- a/eos/effects/armorhpbonusadd.py +++ b/eos/effects/armorhpbonusadd.py @@ -1,7 +1,7 @@ # armorHPBonusAdd # # Used by: -# Modules from group: Armor Reinforcer (48 of 48) +# Modules from group: Armor Reinforcer (51 of 51) type = "passive" diff --git a/eos/effects/armorreinforcermassadd.py b/eos/effects/armorreinforcermassadd.py index d61b0224c..e60326892 100644 --- a/eos/effects/armorreinforcermassadd.py +++ b/eos/effects/armorreinforcermassadd.py @@ -1,7 +1,7 @@ # armorReinforcerMassAdd # # Used by: -# Modules from group: Armor Reinforcer (48 of 48) +# Modules from group: Armor Reinforcer (51 of 51) type = "passive" diff --git a/eos/effects/armorrepair.py b/eos/effects/armorrepair.py index 8555baec0..d65f26ca5 100644 --- a/eos/effects/armorrepair.py +++ b/eos/effects/armorrepair.py @@ -1,7 +1,7 @@ # armorRepair # # Used by: -# Modules from group: Armor Repair Unit (105 of 105) +# Modules from group: Armor Repair Unit (108 of 108) runTime = "late" type = "active" diff --git a/eos/effects/capacitorcapacitymultiply.py b/eos/effects/capacitorcapacitymultiply.py index 4b277a8da..20a75537d 100644 --- a/eos/effects/capacitorcapacitymultiply.py +++ b/eos/effects/capacitorcapacitymultiply.py @@ -4,7 +4,7 @@ # Modules from group: Capacitor Flux Coil (6 of 6) # Modules from group: Capacitor Power Relay (20 of 20) # Modules from group: Power Diagnostic System (23 of 23) -# Modules from group: Propulsion Module (65 of 127) +# Modules from group: Propulsion Module (68 of 133) # Modules from group: Reactor Control Unit (22 of 22) type = "passive" diff --git a/eos/effects/energyneutralizerfalloff.py b/eos/effects/energyneutralizerfalloff.py index 37d829baa..67e55e7ad 100644 --- a/eos/effects/energyneutralizerfalloff.py +++ b/eos/effects/energyneutralizerfalloff.py @@ -1,7 +1,7 @@ # energyNeutralizerFalloff # # Used by: -# Modules from group: Energy Neutralizer (51 of 51) +# Modules from group: Energy Neutralizer (54 of 54) from eos.saveddata.module import State from eos.modifiedAttributeDict import ModifiedAttributeDict diff --git a/eos/effects/fueledarmorrepair.py b/eos/effects/fueledarmorrepair.py index 875a25cd2..049c799c1 100644 --- a/eos/effects/fueledarmorrepair.py +++ b/eos/effects/fueledarmorrepair.py @@ -1,7 +1,7 @@ # fueledArmorRepair # # Used by: -# Modules from group: Ancillary Armor Repairer (4 of 4) +# Modules from group: Ancillary Armor Repairer (7 of 7) runTime = "late" type = "active" diff --git a/eos/effects/fueledshieldboosting.py b/eos/effects/fueledshieldboosting.py index 36db95e2c..0cbbd439c 100644 --- a/eos/effects/fueledshieldboosting.py +++ b/eos/effects/fueledshieldboosting.py @@ -1,7 +1,7 @@ # fueledShieldBoosting # # Used by: -# Modules from group: Ancillary Shield Booster (5 of 5) +# Modules from group: Ancillary Shield Booster (8 of 8) runTime = "late" type = "active" diff --git a/eos/effects/modulebonusafterburner.py b/eos/effects/modulebonusafterburner.py index c26412bb0..71f4c96b1 100644 --- a/eos/effects/modulebonusafterburner.py +++ b/eos/effects/modulebonusafterburner.py @@ -1,7 +1,7 @@ # moduleBonusAfterburner # # Used by: -# Modules from group: Propulsion Module (62 of 127) +# Modules from group: Propulsion Module (65 of 133) type = "active" runTime = "late" diff --git a/eos/effects/modulebonusmicrowarpdrive.py b/eos/effects/modulebonusmicrowarpdrive.py index 75df915ce..70478fa71 100644 --- a/eos/effects/modulebonusmicrowarpdrive.py +++ b/eos/effects/modulebonusmicrowarpdrive.py @@ -1,7 +1,7 @@ # moduleBonusMicrowarpdrive # # Used by: -# Modules from group: Propulsion Module (65 of 127) +# Modules from group: Propulsion Module (68 of 133) type = "active" runTime = "late" diff --git a/eos/effects/overloadrofbonus.py b/eos/effects/overloadrofbonus.py index 4d5707173..c0d81ca0b 100644 --- a/eos/effects/overloadrofbonus.py +++ b/eos/effects/overloadrofbonus.py @@ -2,7 +2,7 @@ # # Used by: # Modules from group: Missile Launcher Torpedo (22 of 22) -# Items from market group: Ship Equipment > Turrets & Bays (429 of 863) +# Items from market group: Ship Equipment > Turrets & Bays (429 of 880) # Module: Interdiction Sphere Launcher I type = "overheat" diff --git a/eos/effects/overloadselfarmordamageamountdurationbonus.py b/eos/effects/overloadselfarmordamageamountdurationbonus.py index 3545e6dab..c7a2a1049 100644 --- a/eos/effects/overloadselfarmordamageamountdurationbonus.py +++ b/eos/effects/overloadselfarmordamageamountdurationbonus.py @@ -1,8 +1,8 @@ # overloadSelfArmorDamageAmountDurationBonus # # Used by: -# Modules from group: Ancillary Armor Repairer (4 of 4) -# Modules from group: Armor Repair Unit (105 of 105) +# Modules from group: Ancillary Armor Repairer (7 of 7) +# Modules from group: Armor Repair Unit (108 of 108) type = "overheat" diff --git a/eos/effects/overloadselfdamagebonus.py b/eos/effects/overloadselfdamagebonus.py index a60a741e4..516932070 100644 --- a/eos/effects/overloadselfdamagebonus.py +++ b/eos/effects/overloadselfdamagebonus.py @@ -3,6 +3,7 @@ # Used by: # Modules from group: Energy Weapon (101 of 214) # Modules from group: Hybrid Weapon (105 of 221) +# Modules from group: Precursor Turret (14 of 14) # Modules from group: Projectile Weapon (99 of 165) type = "overheat" diff --git a/eos/effects/overloadselfdurationbonus.py b/eos/effects/overloadselfdurationbonus.py index 356eab98a..498e3a527 100644 --- a/eos/effects/overloadselfdurationbonus.py +++ b/eos/effects/overloadselfdurationbonus.py @@ -2,7 +2,7 @@ # # Used by: # Modules from group: Capacitor Booster (59 of 59) -# Modules from group: Energy Neutralizer (51 of 51) +# Modules from group: Energy Neutralizer (54 of 54) # Modules from group: Energy Nosferatu (51 of 51) # Modules from group: Hull Repair Unit (25 of 25) # Modules from group: Remote Armor Repairer (39 of 39) diff --git a/eos/effects/overloadselfrangebonus.py b/eos/effects/overloadselfrangebonus.py index f306a064f..781bf4794 100644 --- a/eos/effects/overloadselfrangebonus.py +++ b/eos/effects/overloadselfrangebonus.py @@ -2,8 +2,8 @@ # # Used by: # Modules from group: Stasis Grappler (7 of 7) -# Modules from group: Stasis Web (18 of 18) -# Modules from group: Warp Scrambler (52 of 53) +# Modules from group: Stasis Web (19 of 19) +# Modules from group: Warp Scrambler (54 of 55) type = "overheat" diff --git a/eos/effects/overloadselfshieldbonusdurationbonus.py b/eos/effects/overloadselfshieldbonusdurationbonus.py index cc833be68..4706ccbca 100644 --- a/eos/effects/overloadselfshieldbonusdurationbonus.py +++ b/eos/effects/overloadselfshieldbonusdurationbonus.py @@ -1,8 +1,8 @@ # overloadSelfShieldBonusDurationBonus # # Used by: -# Modules from group: Ancillary Shield Booster (5 of 5) -# Modules from group: Shield Booster (93 of 93) +# Modules from group: Ancillary Shield Booster (8 of 8) +# Modules from group: Shield Booster (97 of 97) type = "overheat" diff --git a/eos/effects/overloadselfspeedbonus.py b/eos/effects/overloadselfspeedbonus.py index c7ee81a90..cc5dbe3f6 100644 --- a/eos/effects/overloadselfspeedbonus.py +++ b/eos/effects/overloadselfspeedbonus.py @@ -1,7 +1,7 @@ # overloadSelfSpeedBonus # # Used by: -# Modules from group: Propulsion Module (127 of 127) +# Modules from group: Propulsion Module (133 of 133) type = "overheat" diff --git a/eos/effects/remotewebifierfalloff.py b/eos/effects/remotewebifierfalloff.py index 4d5bc770c..ccf7d88cd 100644 --- a/eos/effects/remotewebifierfalloff.py +++ b/eos/effects/remotewebifierfalloff.py @@ -2,7 +2,7 @@ # # Used by: # Modules from group: Stasis Grappler (7 of 7) -# Modules from group: Stasis Web (18 of 18) +# Modules from group: Stasis Web (19 of 19) type = "active", "projected" diff --git a/eos/effects/shieldboostamplifierpassive.py b/eos/effects/shieldboostamplifierpassive.py index c1361e338..182c04acf 100644 --- a/eos/effects/shieldboostamplifierpassive.py +++ b/eos/effects/shieldboostamplifierpassive.py @@ -1,7 +1,6 @@ # shieldBoostAmplifierPassive # # Used by: -# Implants named like: Agency 'Hardshell' TB Dose (3 of 3) # Implants named like: grade Crystal (15 of 18) type = "passive" diff --git a/eos/effects/shieldboostamplifierpassivebooster.py b/eos/effects/shieldboostamplifierpassivebooster.py index 0c7158194..46b55354e 100644 --- a/eos/effects/shieldboostamplifierpassivebooster.py +++ b/eos/effects/shieldboostamplifierpassivebooster.py @@ -1,6 +1,7 @@ # shieldBoostAmplifierPassiveBooster # # Used by: +# Implants named like: Agency 'Hardshell' TB Dose (3 of 3) # Implants named like: Blue Pill Booster (5 of 5) # Implant: Antipharmakon Thureo type = "passive" diff --git a/eos/effects/shieldboosting.py b/eos/effects/shieldboosting.py index 8d8676d0e..808e2f1b0 100644 --- a/eos/effects/shieldboosting.py +++ b/eos/effects/shieldboosting.py @@ -1,7 +1,7 @@ # shieldBoosting # # Used by: -# Modules from group: Shield Booster (93 of 93) +# Modules from group: Shield Booster (97 of 97) runTime = "late" type = "active" diff --git a/eos/effects/shieldcapacitybonusonline.py b/eos/effects/shieldcapacitybonusonline.py index 7c4cb037d..cba8f70bb 100644 --- a/eos/effects/shieldcapacitybonusonline.py +++ b/eos/effects/shieldcapacitybonusonline.py @@ -1,7 +1,7 @@ # shieldCapacityBonusOnline # # Used by: -# Modules from group: Shield Extender (33 of 33) +# Modules from group: Shield Extender (36 of 36) # Modules from group: Shield Resistance Amplifier (88 of 88) type = "passive" diff --git a/eos/effects/shipbonusnosneutcapneedrolebonus2.py b/eos/effects/shipbonusnosneutcapneedrolebonus2.py new file mode 100644 index 000000000..894025e9b --- /dev/null +++ b/eos/effects/shipbonusnosneutcapneedrolebonus2.py @@ -0,0 +1,12 @@ +# shipBonusNosNeutCapNeedRoleBonus2 +# +# Used by: +# Ship: Demavik +# Ship: Leshak +# Ship: Vedmak +type = "passive" + + +def handler(fit, ship, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capacitor Emission Systems"), + "capacitorNeed", ship.getModifiedItemAttr("shipBonusRole2")) diff --git a/eos/effects/shipbonuspctdamagepc1.py b/eos/effects/shipbonuspctdamagepc1.py new file mode 100644 index 000000000..11f3e5d0d --- /dev/null +++ b/eos/effects/shipbonuspctdamagepc1.py @@ -0,0 +1,10 @@ +# shipbonusPCTDamagePC1 +# +# Used by: +# Ship: Vedmak +type = "passive" + + +def handler(fit, ship, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Precursor Turret"), + "damageMultiplier", ship.getModifiedItemAttr("shipBonusPC1"), skill="Precursor Cruiser") diff --git a/eos/effects/shipbonuspctdamagepf1.py b/eos/effects/shipbonuspctdamagepf1.py new file mode 100644 index 000000000..c9c486426 --- /dev/null +++ b/eos/effects/shipbonuspctdamagepf1.py @@ -0,0 +1,10 @@ +# shipbonusPCTDamagePF1 +# +# Used by: +# Ship: Demavik +type = "passive" + + +def handler(fit, ship, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Precursor Turret"), + "damageMultiplier", ship.getModifiedItemAttr("shipBonusPF1"), skill="Precursor Frigate") diff --git a/eos/effects/shipbonuspctoptimalpf2.py b/eos/effects/shipbonuspctoptimalpf2.py new file mode 100644 index 000000000..3b468245e --- /dev/null +++ b/eos/effects/shipbonuspctoptimalpf2.py @@ -0,0 +1,10 @@ +# shipbonusPCTOptimalPF2 +# +# Used by: +# Ship: Demavik +type = "passive" + + +def handler(fit, ship, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Precursor Turret"), + "maxRange", ship.getModifiedItemAttr("shipBonusPF2"), skill="Precursor Frigate") diff --git a/eos/effects/shipbonuspcttrackingpc2.py b/eos/effects/shipbonuspcttrackingpc2.py new file mode 100644 index 000000000..03ea7bc05 --- /dev/null +++ b/eos/effects/shipbonuspcttrackingpc2.py @@ -0,0 +1,10 @@ +# shipbonusPCTTrackingPC2 +# +# Used by: +# Ship: Vedmak +type = "passive" + + +def handler(fit, ship, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Precursor Turret"), + "trackingSpeed", ship.getModifiedItemAttr("shipBonusPC2"), skill="Precursor Cruiser") diff --git a/eos/effects/shipbonusremoterepcapneedrolebonus2.py b/eos/effects/shipbonusremoterepcapneedrolebonus2.py new file mode 100644 index 000000000..5e055b9ac --- /dev/null +++ b/eos/effects/shipbonusremoterepcapneedrolebonus2.py @@ -0,0 +1,12 @@ +# shipBonusRemoteRepCapNeedRoleBonus2 +# +# Used by: +# Ship: Demavik +# Ship: Leshak +# Ship: Vedmak +type = "passive" + + +def handler(fit, ship, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), + "capacitorNeed", ship.getModifiedItemAttr("shipBonusRole2")) diff --git a/eos/effects/shipbonusremoterepmaxrangerolebonus1.py b/eos/effects/shipbonusremoterepmaxrangerolebonus1.py new file mode 100644 index 000000000..202710f38 --- /dev/null +++ b/eos/effects/shipbonusremoterepmaxrangerolebonus1.py @@ -0,0 +1,12 @@ +# shipBonusRemoteRepMaxRangeRoleBonus1 +# +# Used by: +# Ship: Demavik +# Ship: Leshak +# Ship: Vedmak +type = "passive" + + +def handler(fit, ship, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), + "maxRange", ship.getModifiedItemAttr("shipBonusRole1")) diff --git a/eos/effects/shipbonussmartbombcapneedrolebonus2.py b/eos/effects/shipbonussmartbombcapneedrolebonus2.py new file mode 100644 index 000000000..7bc642369 --- /dev/null +++ b/eos/effects/shipbonussmartbombcapneedrolebonus2.py @@ -0,0 +1,12 @@ +# shipBonusSmartbombCapNeedRoleBonus2 +# +# Used by: +# Ship: Demavik +# Ship: Leshak +# Ship: Vedmak +type = "passive" + + +def handler(fit, ship, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Energy Pulse Weapons"), + "capacitorNeed", ship.getModifiedItemAttr("shipBonusRole2")) diff --git a/eos/effects/shippcbsdmgbonuspcbs2.py b/eos/effects/shippcbsdmgbonuspcbs2.py new file mode 100644 index 000000000..a995bf259 --- /dev/null +++ b/eos/effects/shippcbsdmgbonuspcbs2.py @@ -0,0 +1,10 @@ +# shipPCBSDmgBonusPCBS2 +# +# Used by: +# Ship: Leshak +type = "passive" + + +def handler(fit, ship, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Precursor Turret"), + "damageMultiplier", ship.getModifiedItemAttr("shipBonusPBS2"), skill="Precursor Battleship") diff --git a/eos/effects/shippcbsspeedbonuspcbs1.py b/eos/effects/shippcbsspeedbonuspcbs1.py new file mode 100644 index 000000000..193fba592 --- /dev/null +++ b/eos/effects/shippcbsspeedbonuspcbs1.py @@ -0,0 +1,10 @@ +# shipPCBSSPeedBonusPCBS1 +# +# Used by: +# Ship: Leshak +type = "passive" + + +def handler(fit, ship, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Precursor Turret"), + "speed", ship.getModifiedItemAttr("shipBonusPBS1"), skill="Precursor Battleship") diff --git a/eos/effects/structuralanalysiseffect.py b/eos/effects/structuralanalysiseffect.py index 4bd171488..b94832ca0 100644 --- a/eos/effects/structuralanalysiseffect.py +++ b/eos/effects/structuralanalysiseffect.py @@ -1,7 +1,6 @@ # structuralAnalysisEffect # # Used by: -# Implants named like: Agency 'Hardshell' TB Dose (3 of 3) # Implants named like: Inherent Implants 'Noble' Repair Proficiency RP (6 of 6) # Modules named like: Auxiliary Nano Pump (8 of 8) # Implant: Imperial Navy Modified 'Noble' Implant diff --git a/eos/effects/targetabcattack.py b/eos/effects/targetabcattack.py new file mode 100644 index 000000000..c8d8a8d33 --- /dev/null +++ b/eos/effects/targetabcattack.py @@ -0,0 +1,10 @@ +# targetABCAttack +# +# Used by: +# Modules from group: Precursor Turret (14 of 14) +type = 'active' + + +def handler(fit, module, context): + # Set reload time to 1 second + module.reloadTime = 1000 diff --git a/eos/effects/warpscramble.py b/eos/effects/warpscramble.py index 7424625ae..476608626 100644 --- a/eos/effects/warpscramble.py +++ b/eos/effects/warpscramble.py @@ -1,7 +1,7 @@ # warpScramble # # Used by: -# Modules named like: Warp Disruptor (27 of 27) +# Modules named like: Warp Disruptor (28 of 28) type = "projected", "active" diff --git a/eos/effects/warpscrambleblockmwdwithnpceffect.py b/eos/effects/warpscrambleblockmwdwithnpceffect.py index f8241436d..09bbeb6a7 100644 --- a/eos/effects/warpscrambleblockmwdwithnpceffect.py +++ b/eos/effects/warpscrambleblockmwdwithnpceffect.py @@ -1,7 +1,7 @@ # warpScrambleBlockMWDWithNPCEffect # # Used by: -# Modules named like: Warp Scrambler (26 of 26) +# Modules named like: Warp Scrambler (27 of 27) from eos.saveddata.module import State runTime = "early" diff --git a/eos/saveddata/module.py b/eos/saveddata/module.py index ced03eb45..c55bc60cc 100644 --- a/eos/saveddata/module.py +++ b/eos/saveddata/module.py @@ -337,6 +337,8 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut): lambda attr: (func("%sDamage" % attr) or 0) * (1 - getattr(targetResists, "%sAmount" % attr, 0)), self.DAMAGE_TYPES)) volley *= self.getModifiedItemAttr("damageMultiplier") or 1 + # Disintegrator-specific ramp-up multiplier + volley *= (self.getModifiedItemAttr("damageMultiplierBonusMax") or 0) + 1 if volley: cycleTime = self.cycleTime # Some weapons repeat multiple times in one cycle (think doomsdays) diff --git a/eve.db b/eve.db index 5493b4e20..f7188c49d 100644 Binary files a/eve.db and b/eve.db differ diff --git a/gui/builtinViewColumns/misc.py b/gui/builtinViewColumns/misc.py index a3c84b4a7..b0e6df459 100644 --- a/gui/builtinViewColumns/misc.py +++ b/gui/builtinViewColumns/misc.py @@ -101,7 +101,7 @@ class Miscellanea(ViewColumn): return text, tooltip pass - elif itemGroup in ("Energy Weapon", "Hybrid Weapon", "Projectile Weapon", "Combat Drone", "Fighter Drone"): + elif itemGroup in ("Energy Weapon", "Hybrid Weapon", "Projectile Weapon", "Precursor Turret", "Combat Drone", "Fighter Drone"): trackingSpeed = stuff.getModifiedItemAttr("trackingSpeed") if not trackingSpeed: return "", None