diff --git a/eos/saveddata/fit.py b/eos/saveddata/fit.py index 05081da7b..2f4cb90f2 100644 --- a/eos/saveddata/fit.py +++ b/eos/saveddata/fit.py @@ -677,6 +677,8 @@ class Fit(object): self.ship.boostItemAttr("{}ThermalDamageResonance".format(tankType), value) self.ship.boostItemAttr("thermalDamageResonance", value) # for hull + if warfareBuffID == 96: # Weather_infernal_armor_hp_bonus + self.ship.boostItemAttr("armorHP", value) # for hull del self.commandBonuses[warfareBuffID] diff --git a/eve.db b/eve.db index 27c702d17..b6de58bcf 100644 Binary files a/eve.db and b/eve.db differ diff --git a/gui/builtinItemStatsViews/itemEffects.py b/gui/builtinItemStatsViews/itemEffects.py index e586786a6..151844992 100644 --- a/gui/builtinItemStatsViews/itemEffects.py +++ b/gui/builtinItemStatsViews/itemEffects.py @@ -45,7 +45,7 @@ class ItemEffects(wx.Panel): self.effectList.SetColumnWidth(4, 40) item = self.item - effects = item.effects + self.effects = effects = item.effects names = list(effects.keys()) names.sort() @@ -100,14 +100,15 @@ class ItemEffects(wx.Panel): self.RefreshValues(event) - @staticmethod - def OnRightClick(event): + def OnRightClick(self, event): """ Debug use: open effect file with default application. If effect file does not exist, create it """ - file_ = os.path.join(config.pyfaPath, "eos", "effects", "%s.py" % event.GetText().lower()) + effect = self.effects[event.GetText()]; + + file_ = os.path.join(config.pyfaPath, "eos", "effects", "%s.py" % effect.handlerName) if not os.path.isfile(file_): open(file_, 'a').close() diff --git a/scripts/jsonToSql.py b/scripts/jsonToSql.py index 1a284a5da..284ff6caf 100755 --- a/scripts/jsonToSql.py +++ b/scripts/jsonToSql.py @@ -213,8 +213,13 @@ def main(db, json_path): if (row["published"] or row['groupID'] == 1306 # group Ship Modifiers, for items like tactical t3 ship modes or row['typeName'].startswith('Civilian') # Civilian weapons - or row['typeID'] in (41549, 41548, 41551,41550) # Micro Bombs (Fighters) - or row['groupID'] in (1882, 1975, 1971) # Abysmal weather (environment) + or row['typeID'] in (41549, 41548, 41551, 41550) # Micro Bombs (Fighters) + or row['groupID'] in ( + 1882, + 1975, + 1971, + 1983 # the "container" for the abysmal environments + ) # Abysmal weather (environment) ): eveTypes.add(row["typeID"])