diff --git a/config.py b/config.py index 9ffbf809b..43e01afc7 100644 --- a/config.py +++ b/config.py @@ -19,9 +19,9 @@ debug = False saveInRoot = False # Version data -version = "1.30.1" -tag = "git" -expansionName = "YC119.7" +version = "1.31.0" +tag = "Stable " +expansionName = "YC119.8" expansionVersion = "1.0" evemonMinVersion = "4081" diff --git a/eos/effects/ammospeedmultiplier.py b/eos/effects/ammospeedmultiplier.py index 959f959bb..1bc1086a2 100644 --- a/eos/effects/ammospeedmultiplier.py +++ b/eos/effects/ammospeedmultiplier.py @@ -3,7 +3,6 @@ # Used by: # Charges from group: Festival Charges (10 of 10) # Charges from group: Interdiction Probe (2 of 2) -# Charges from group: Survey Probe (3 of 3) type = "passive" diff --git a/eos/effects/boosterarmorhppenalty.py b/eos/effects/boosterarmorhppenalty.py index e7b202a5a..d72d57144 100644 --- a/eos/effects/boosterarmorhppenalty.py +++ b/eos/effects/boosterarmorhppenalty.py @@ -1,7 +1,7 @@ # boosterArmorHpPenalty # # Used by: -# Implants from group: Booster (12 of 55) +# Implants from group: Booster (12 of 48) type = "boosterSideEffect" # User-friendly name for the side effect diff --git a/eos/effects/boostermaxvelocitypenalty.py b/eos/effects/boostermaxvelocitypenalty.py index af2baa170..8ef90a731 100644 --- a/eos/effects/boostermaxvelocitypenalty.py +++ b/eos/effects/boostermaxvelocitypenalty.py @@ -1,7 +1,7 @@ # boosterMaxVelocityPenalty # # Used by: -# Implants from group: Booster (12 of 55) +# Implants from group: Booster (12 of 48) type = "boosterSideEffect" # User-friendly name for the side effect diff --git a/eos/effects/boostershieldcapacitypenalty.py b/eos/effects/boostershieldcapacitypenalty.py index abf077c51..64401813e 100644 --- a/eos/effects/boostershieldcapacitypenalty.py +++ b/eos/effects/boostershieldcapacitypenalty.py @@ -1,7 +1,7 @@ # boosterShieldCapacityPenalty # # Used by: -# Implants from group: Booster (12 of 55) +# Implants from group: Booster (12 of 48) type = "boosterSideEffect" # User-friendly name for the side effect diff --git a/eos/effects/covertopsandreconopscloakmoduledelaybonus.py b/eos/effects/covertopsandreconopscloakmoduledelaybonus.py index be7408345..f3e88d3c1 100644 --- a/eos/effects/covertopsandreconopscloakmoduledelaybonus.py +++ b/eos/effects/covertopsandreconopscloakmoduledelaybonus.py @@ -5,8 +5,8 @@ # Ships from group: Blockade Runner (4 of 4) # Ships from group: Covert Ops (7 of 7) # Ships from group: Expedition Frigate (2 of 2) -# Ships from group: Force Recon Ship (7 of 7) -# Ships from group: Stealth Bomber (4 of 4) +# Ships from group: Force Recon Ship (7 of 8) +# Ships from group: Stealth Bomber (4 of 5) # Ships named like: Stratios (2 of 2) # Subsystems named like: Defensive Covert Reconfiguration (4 of 4) # Ship: Astero diff --git a/eos/effects/covertopscpubonus1.py b/eos/effects/covertopscpubonus1.py index ebc69c273..8c45bb186 100644 --- a/eos/effects/covertopscpubonus1.py +++ b/eos/effects/covertopscpubonus1.py @@ -1,7 +1,7 @@ # covertOpsCpuBonus1 # # Used by: -# Ships from group: Stealth Bomber (4 of 4) +# Ships from group: Stealth Bomber (4 of 5) # Subsystems named like: Defensive Covert Reconfiguration (4 of 4) type = "passive" diff --git a/eos/effects/covertopsstealthbombersiegemissilelauncerpowerneedbonus.py b/eos/effects/covertopsstealthbombersiegemissilelauncerpowerneedbonus.py index 9f65b698a..3fb9ab56c 100644 --- a/eos/effects/covertopsstealthbombersiegemissilelauncerpowerneedbonus.py +++ b/eos/effects/covertopsstealthbombersiegemissilelauncerpowerneedbonus.py @@ -1,7 +1,7 @@ # covertOpsStealthBomberSiegeMissileLauncerPowerNeedBonus # # Used by: -# Ships from group: Stealth Bomber (4 of 4) +# Ships from group: Stealth Bomber (4 of 5) type = "passive" diff --git a/eos/effects/covertopsstealthbombertargettingdelaybonus.py b/eos/effects/covertopsstealthbombertargettingdelaybonus.py index cb1a7b18f..e5584ccfc 100644 --- a/eos/effects/covertopsstealthbombertargettingdelaybonus.py +++ b/eos/effects/covertopsstealthbombertargettingdelaybonus.py @@ -2,7 +2,7 @@ # # Used by: # Ships from group: Black Ops (4 of 4) -# Ships from group: Stealth Bomber (4 of 4) +# Ships from group: Stealth Bomber (4 of 5) # Ship: Caedes # Ship: Chremoas # Ship: Endurance diff --git a/eos/effects/cynosuraldurationbonus.py b/eos/effects/cynosuraldurationbonus.py index 388e64125..e49828315 100644 --- a/eos/effects/cynosuraldurationbonus.py +++ b/eos/effects/cynosuraldurationbonus.py @@ -1,7 +1,7 @@ # cynosuralDurationBonus # # Used by: -# Ships from group: Force Recon Ship (6 of 7) +# Ships from group: Force Recon Ship (6 of 8) type = "passive" diff --git a/eos/effects/cynosuraltheoryconsumptionbonus.py b/eos/effects/cynosuraltheoryconsumptionbonus.py index 3d1be5194..f0f43c0fb 100644 --- a/eos/effects/cynosuraltheoryconsumptionbonus.py +++ b/eos/effects/cynosuraltheoryconsumptionbonus.py @@ -1,7 +1,7 @@ # cynosuralTheoryConsumptionBonus # # Used by: -# Ships from group: Force Recon Ship (6 of 7) +# Ships from group: Force Recon Ship (6 of 8) # Skill: Cynosural Field Theory type = "passive" diff --git a/eos/effects/doomsdayaoeecm.py b/eos/effects/doomsdayaoeecm.py index f21b89391..230eb2f16 100644 --- a/eos/effects/doomsdayaoeecm.py +++ b/eos/effects/doomsdayaoeecm.py @@ -1,7 +1,7 @@ -# ECMBurstJammer +# doomsdayAOEECM # # Used by: -# Modules from group: Burst Jammer (11 of 11) +# Module: ECM Jammer Burst Projector from eos.modifiedAttributeDict import ModifiedAttributeDict type = "projected", "active" diff --git a/eos/effects/missiledmgbonus.py b/eos/effects/missiledmgbonus.py index 48a845345..3abc18387 100644 --- a/eos/effects/missiledmgbonus.py +++ b/eos/effects/missiledmgbonus.py @@ -1,7 +1,7 @@ # missileDMGBonus # # Used by: -# Modules from group: Ballistic Control system (17 of 17) +# Modules from group: Ballistic Control system (18 of 18) type = "passive" diff --git a/eos/effects/missilelauncherspeedmultiplier.py b/eos/effects/missilelauncherspeedmultiplier.py index e9a3c1271..9e2a28559 100644 --- a/eos/effects/missilelauncherspeedmultiplier.py +++ b/eos/effects/missilelauncherspeedmultiplier.py @@ -1,7 +1,7 @@ # missileLauncherSpeedMultiplier # # Used by: -# Modules from group: Ballistic Control system (17 of 17) +# Modules from group: Ballistic Control system (18 of 18) type = "passive" diff --git a/eos/effects/overloadrofbonus.py b/eos/effects/overloadrofbonus.py index be8e2af22..6248b687d 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 (428 of 859) +# Items from market group: Ship Equipment > Turrets & Bays (429 of 861) # Module: Interdiction Sphere Launcher I type = "overheat" diff --git a/eos/effects/reconshipcloakcpubonus1.py b/eos/effects/reconshipcloakcpubonus1.py index 4032baabc..8f63a28f2 100644 --- a/eos/effects/reconshipcloakcpubonus1.py +++ b/eos/effects/reconshipcloakcpubonus1.py @@ -1,7 +1,7 @@ # reconShipCloakCpuBonus1 # # Used by: -# Ships from group: Force Recon Ship (6 of 7) +# Ships from group: Force Recon Ship (6 of 8) type = "passive" runTime = "early" diff --git a/eos/effects/usemissiles.py b/eos/effects/usemissiles.py index 1971dbe46..d77c56e3e 100644 --- a/eos/effects/usemissiles.py +++ b/eos/effects/usemissiles.py @@ -3,7 +3,7 @@ # Used by: # Modules from group: Missile Launcher Heavy (12 of 12) # Modules from group: Missile Launcher Rocket (15 of 15) -# Modules named like: Launcher (153 of 153) +# Modules named like: Launcher (154 of 154) type = 'active', "projected" diff --git a/eve.db b/eve.db index 82a8cf198..f0345c126 100644 Binary files a/eve.db and b/eve.db differ diff --git a/gui/builtinStatsViews/miningyieldViewFull.py b/gui/builtinStatsViews/miningyieldViewFull.py index 7a9808284..912bddc2c 100644 --- a/gui/builtinStatsViews/miningyieldViewFull.py +++ b/gui/builtinStatsViews/miningyieldViewFull.py @@ -123,7 +123,7 @@ class MiningYieldViewFull(StatsView): # Get the TogglePanel tp = self.panel.GetParent() # Bind the new panel's children to allow context menu access - self.parent.applyBinding(self.parent, tp.GetContentPane()) + self.parent.applyBinding(self.parent, tp.GetContentPane()) tp.SetLabel(view.getHeaderText(fit)) view.refreshPanel(fit) diff --git a/gui/statsPane.py b/gui/statsPane.py index c970ef672..c186c4531 100644 --- a/gui/statsPane.py +++ b/gui/statsPane.py @@ -113,7 +113,7 @@ class StatsPane(wx.Panel): view.populatePanel(contentPanel, headerPanel) tp.SetLabel(view.getHeaderText(None)) view.refreshPanel(None) - + contentPanel.Bind(wx.EVT_RIGHT_DOWN, self.contextHandler(contentPanel)) for child in contentPanel.GetChildren(): child.Bind(wx.EVT_RIGHT_DOWN, self.contextHandler(contentPanel)) @@ -148,5 +148,4 @@ class StatsPane(wx.Panel): def applyBinding(self, contentPanel): pyfalog.debug("Attempt applyBinding to children of {0}", contentPanel.viewName) for child in contentPanel.GetChildren(): - child.Bind(wx.EVT_RIGHT_DOWN, self.contextHandler(contentPanel)) - \ No newline at end of file + child.Bind(wx.EVT_RIGHT_DOWN, self.contextHandler(contentPanel))