Merge remote-tracking branch 'origin/master' into i18n
# Conflicts: # staticdata/fsd_binary/marketgroups.json # staticdata/fsd_binary/typedogma.json # staticdata/fsd_lite/evegroups.json # staticdata/fsd_lite/evetypes.json # staticdata/phobos/metadata.0.json
This commit is contained in:
blitzmann
18
eos/db/migrations/upgrade40.py
Normal file
18
eos/db/migrations/upgrade40.py
Normal file
@@ -0,0 +1,18 @@
|
||||
"""
|
||||
Migration 40
|
||||
|
||||
Imports all item conversions since Migration 28 and runs them against module.baseItemID. This column seems to have been
|
||||
forgotten about since it's been added.
|
||||
|
||||
"""
|
||||
from .upgrade36 import CONVERSIONS as u36
|
||||
from .upgrade37 import CONVERSIONS as u37
|
||||
from .upgrade38 import CONVERSIONS as u38
|
||||
from .upgrade39 import CONVERSIONS as u39
|
||||
|
||||
def upgrade(saveddata_engine):
|
||||
for conversions in [u36, u37, u38, u39]:
|
||||
for replacement_item, list in conversions.items():
|
||||
for retired_item in list:
|
||||
saveddata_engine.execute('UPDATE "modules" SET "baseItemID" = ? WHERE "baseItemID" = ?',
|
||||
(replacement_item, retired_item))
|
||||
50
eos/db/migrations/upgrade41.py
Normal file
50
eos/db/migrations/upgrade41.py
Normal file
@@ -0,0 +1,50 @@
|
||||
"""
|
||||
Migration 41
|
||||
|
||||
- Resistance plating tiericide
|
||||
"""
|
||||
|
||||
CONVERSIONS = {
|
||||
16345: ( # Upgraded Layered Coating I
|
||||
16347, # Limited Layered Plating I
|
||||
16349, # 'Scarab' Layered Plating I
|
||||
16351, # 'Grail' Layered Plating I
|
||||
),
|
||||
16305: ( # Upgraded Multispectrum Coating I
|
||||
16307, # Limited Adaptive Nano Plating I
|
||||
16309, # 'Collateral' Adaptive Nano Plating I
|
||||
16311, # 'Refuge' Adaptive Nano Plating I
|
||||
),
|
||||
16329: ( # Upgraded EM Coating I
|
||||
16331, # Limited EM Plating I
|
||||
16333, # 'Contour' EM Plating I
|
||||
16335, # 'Spiegel' EM Plating I
|
||||
),
|
||||
16321: ( # Upgraded Explosive Coating I
|
||||
16323, # Limited Explosive Plating I
|
||||
16325, # Experimental Explosive Plating I
|
||||
16319, # 'Aegis' Explosive Plating I
|
||||
),
|
||||
16313: ( # Upgraded Kinetic Coating I
|
||||
16315, # Limited Kinetic Plating I
|
||||
16317, # Experimental Kinetic Plating I
|
||||
16327, # 'Element' Kinetic Plating I
|
||||
),
|
||||
16337: ( # Upgraded Thermal Coating I
|
||||
16339, # Limited Thermal Plating I
|
||||
16341, # Experimental Thermal Plating I
|
||||
16343, # Prototype Thermal Plating I
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
def upgrade(saveddata_engine):
|
||||
# Convert modules
|
||||
for replacement_item, list in CONVERSIONS.items():
|
||||
for retired_item in list:
|
||||
saveddata_engine.execute('UPDATE "modules" SET "itemID" = ? WHERE "itemID" = ?',
|
||||
(replacement_item, retired_item))
|
||||
saveddata_engine.execute('UPDATE "modules" SET "baseItemID" = ? WHERE "baseItemID" = ?',
|
||||
(replacement_item, retired_item))
|
||||
saveddata_engine.execute('UPDATE "cargo" SET "itemID" = ? WHERE "itemID" = ?',
|
||||
(replacement_item, retired_item))
|
||||
@@ -440,7 +440,7 @@ class Effect63(BaseEffect):
|
||||
armorHPMultiply
|
||||
|
||||
Used by:
|
||||
Modules from group: Armor Coating (202 of 202)
|
||||
Modules from group: Armor Coating (184 of 184)
|
||||
Modules from group: Armor Plating Energized (187 of 187)
|
||||
"""
|
||||
|
||||
@@ -2335,7 +2335,8 @@ class Effect763(BaseEffect):
|
||||
@staticmethod
|
||||
def handler(fit, container, context, projectionRange, **kwargs):
|
||||
for dmgType in ('em', 'kinetic', 'explosive', 'thermal'):
|
||||
fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
|
||||
fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation') or
|
||||
mod.charge.requiresSkill('Defender Missiles'),
|
||||
'%sDamage' % dmgType,
|
||||
container.getModifiedItemAttr('missileDamageMultiplierBonus'),
|
||||
stackingPenalties=True, **kwargs)
|
||||
@@ -6077,7 +6078,7 @@ class Effect2041(BaseEffect):
|
||||
modifyArmorResonancePostPercent
|
||||
|
||||
Used by:
|
||||
Modules from group: Armor Coating (202 of 202)
|
||||
Modules from group: Armor Coating (184 of 184)
|
||||
Modules from group: Armor Plating Energized (187 of 187)
|
||||
"""
|
||||
|
||||
@@ -36112,7 +36113,7 @@ class Effect7232(BaseEffect):
|
||||
modifyDamageMultiplierBonusMax
|
||||
|
||||
Used by:
|
||||
Implants named like: Grade Mimesis (15 of 18)
|
||||
Implants named like: grade Mimesis (15 of 18)
|
||||
"""
|
||||
|
||||
type = 'passive'
|
||||
@@ -36129,7 +36130,7 @@ class Effect7233(BaseEffect):
|
||||
modifyDamageMultiplierBonusPerCycle
|
||||
|
||||
Used by:
|
||||
Implants named like: Grade Mimesis (15 of 18)
|
||||
Implants named like: grade Mimesis (15 of 18)
|
||||
"""
|
||||
|
||||
type = 'passive'
|
||||
@@ -36146,7 +36147,7 @@ class Effect7234(BaseEffect):
|
||||
implantSetMimesis
|
||||
|
||||
Used by:
|
||||
Implants named like: Grade Mimesis (18 of 18)
|
||||
Implants named like: grade Mimesis (18 of 18)
|
||||
"""
|
||||
|
||||
runTime = 'early'
|
||||
|
||||
@@ -90,8 +90,6 @@ class ProjectedView(d.Display):
|
||||
self.Bind(wx.EVT_LEFT_DCLICK, self.onLeftDoubleClick)
|
||||
self.Bind(wx.EVT_KEY_UP, self.kbEvent)
|
||||
|
||||
self.droneView = gui.builtinAdditionPanes.droneView.DroneView
|
||||
|
||||
self.Bind(wx.EVT_CONTEXT_MENU, self.spawnMenu)
|
||||
|
||||
self.SetDropTarget(ProjectedViewDrop(self.handleListDrag))
|
||||
@@ -162,7 +160,7 @@ class ProjectedView(d.Display):
|
||||
if item.marketGroup is None:
|
||||
item = item.metaGroup.parent
|
||||
|
||||
return (self.droneView.DRONE_ORDER.index(item.marketGroup.name),
|
||||
return (gui.builtinAdditionPanes.droneView.DRONE_ORDER.index(item.marketGroup.name),
|
||||
drone.item.name)
|
||||
|
||||
@staticmethod
|
||||
|
||||
@@ -16,94 +16,226 @@ rename_phrase = " renamed to "
|
||||
conversion_phrase = " converted to "
|
||||
|
||||
text = """
|
||||
Supplemental EM Ward Amplifier converted to 'Basic' EM Shield Amplifier
|
||||
Supplemental Explosive Deflection Amplifier converted to 'Basic' Explosive Shield Amplifier
|
||||
Supplemental Kinetic Deflection Amplifier converted to 'Basic' Kinetic Shield Amplifier
|
||||
Supplemental Thermal Dissipation Amplifier converted to 'Basic' Thermal Shield Amplifier
|
||||
Basic EM Ward Amplifier renamed to 'Basic' EM Shield Amplifier
|
||||
Basic Thermal Dissipation Amplifier renamed to 'Basic' Thermal Shield Amplifier
|
||||
Basic Kinetic Deflection Amplifier renamed to 'Basic' Kinetic Shield Amplifier
|
||||
Basic Explosive Deflection Amplifier renamed to 'Basic' Explosive Shield Amplifier
|
||||
EM Ward Amplifier I renamed to EM Shield Amplifier I
|
||||
Explosive Deflection Amplifier I renamed to Explosive Shield Amplifier I
|
||||
Explosive Deflection Amplifier II renamed to Explosive Shield Amplifier II
|
||||
Thermal Dissipation Amplifier I renamed to Thermal Shield Amplifier I
|
||||
Thermal Dissipation Amplifier II renamed to Thermal Shield Amplifier II
|
||||
Kinetic Deflection Amplifier I renamed to Kinetic Shield Amplifier I
|
||||
Kinetic Deflection Amplifier II renamed to Kinetic Shield Amplifier II
|
||||
EM Ward Amplifier II renamed to EM Shield Amplifier II
|
||||
Upgraded Explosive Deflection Amplifier I renamed to Compact Explosive Shield Amplifier
|
||||
Upgraded Thermal Dissipation Amplifier I renamed to Compact Thermal Shield Amplifier
|
||||
Upgraded EM Ward Amplifier I renamed to Compact EM Shield Amplifier
|
||||
Upgraded Kinetic Deflection Amplifier I renamed to Compact Kinetic Shield Amplifier
|
||||
Domination Explosive Deflection Amplifier renamed to Domination Explosive Shield Amplifier
|
||||
Dread Guristas Explosive Deflection Amplifier renamed to Dread Guristas Explosive Shield Amplifier
|
||||
Domination Thermal Dissipation Amplifier renamed to Domination Thermal Shield Amplifier
|
||||
Dread Guristas Thermal Dissipation Amplifier renamed to Dread Guristas Thermal Shield Amplifier
|
||||
Domination Kinetic Deflection Amplifier renamed to Domination Kinetic Shield Amplifier
|
||||
Dread Guristas Kinetic Deflection Amplifier renamed to Dread Guristas Kinetic Shield Amplifier
|
||||
Domination EM Ward Amplifier renamed to Domination EM Shield Amplifier
|
||||
Dread Guristas EM Ward Amplifier renamed to Dread Guristas EM Shield Amplifier
|
||||
Hakim's Modified Explosive Deflection Amplifier renamed to Hakim's Modified Explosive Shield Amplifier
|
||||
Tobias' Modified Explosive Deflection Amplifier renamed to Tobias' Modified Explosive Shield Amplifier
|
||||
Hakim's Modified Thermal Dissipation Amplifier renamed to Hakim's Modified Thermal Shield Amplifier
|
||||
Tobias' Modified Thermal Dissipation Amplifier renamed to Tobias' Modified Thermal Shield Amplifier
|
||||
Hakim's Modified Kinetic Deflection Amplifier renamed to Hakim's Modified Kinetic Shield Amplifier
|
||||
Tobias' Modified Kinetic Deflection Amplifier renamed to Tobias' Modified Kinetic Shield Amplifier
|
||||
Hakim's Modified EM Ward Amplifier renamed to Hakim's Modified EM Shield Amplifier
|
||||
Tobias' Modified EM Ward Amplifier renamed to Tobias' Modified EM Shield Amplifier
|
||||
Kaikka's Modified Explosive Deflection Amplifier renamed to Kaikka's Modified Explosive Shield Amplifier
|
||||
Thon's Modified Explosive Deflection Amplifier renamed to Thon's Modified Explosive Shield Amplifier
|
||||
Vepas' Modified Explosive Deflection Amplifier renamed to Vepas' Modified Explosive Shield Amplifier
|
||||
Estamel's Modified Explosive Deflection Amplifier renamed to Estamel's Modified Explosive Shield Amplifier
|
||||
Kaikka's Modified Thermal Dissipation Amplifier renamed to Kaikka's Modified Thermal Shield Amplifier
|
||||
Thon's Modified Thermal Dissipation Amplifier renamed to Thon's Modified Thermal Shield Amplifier
|
||||
Vepas' Modified Thermal Dissipation Amplifier renamed to Vepas' Modified Thermal Shield Amplifier
|
||||
Estamel's Modified Thermal Dissipation Amplifier renamed to Estamel's Modified Thermal Shield Amplifier
|
||||
Kaikka's Modified Kinetic Deflection Amplifier renamed to Kaikka's Modified Kinetic Shield Amplifier
|
||||
Thon's Modified Kinetic Deflection Amplifier renamed to Thon's Modified Kinetic Shield Amplifier
|
||||
Vepas' Modified Kinetic Deflection Amplifier renamed to Vepas' Modified Kinetic Shield Amplifier
|
||||
Estamel's Modified Kinetic Deflection Amplifier renamed to Estamel's Modified Kinetic Shield Amplifier
|
||||
Kaikka's Modified EM Ward Amplifier renamed to Kaikka's Modified EM Shield Amplifier
|
||||
Thon's Modified EM Ward Amplifier renamed to Thon's Modified EM Shield Amplifier
|
||||
Vepas' Modified EM Ward Amplifier renamed to Vepas' Modified EM Shield Amplifier
|
||||
Estamel's Modified EM Ward Amplifier renamed to Estamel's Modified EM Shield Amplifier
|
||||
Caldari Navy EM Ward Amplifier renamed to Caldari Navy EM Shield Amplifier
|
||||
Caldari Navy Kinetic Deflection Amplifier renamed to Caldari Navy Kinetic Shield Amplifier
|
||||
Caldari Navy Thermal Dissipation Amplifier renamed to Caldari Navy Thermal Shield Amplifier
|
||||
Caldari Navy Explosive Deflection Amplifier renamed to Caldari Navy Explosive Shield Amplifier
|
||||
Republic Fleet EM Ward Amplifier renamed to Republic Fleet EM Shield Amplifier
|
||||
Republic Fleet Kinetic Deflection Amplifier renamed to Republic Fleet Kinetic Shield Amplifier
|
||||
Republic Fleet Thermal Dissipation Amplifier renamed to Republic Fleet Thermal Shield Amplifier
|
||||
Republic Fleet Explosive Deflection Amplifier renamed to Republic Fleet Explosive Shield Amplifier
|
||||
Pithum C-Type Explosive Deflection Amplifier renamed to Pithum C-Type Explosive Shield Amplifier
|
||||
Pithum C-Type Thermal Dissipation Amplifier renamed to Pithum C-Type Thermal Shield Amplifier
|
||||
Pithum C-Type Kinetic Deflection Amplifier renamed to Pithum C-Type Kinetic Shield Amplifier
|
||||
Pithum C-Type EM Ward Amplifier renamed to Pithum C-Type EM Shield Amplifier
|
||||
Pithum B-Type Explosive Deflection Amplifier renamed to Pithum B-Type Explosive Shield Amplifier
|
||||
Pithum B-Type Thermal Dissipation Amplifier renamed to Pithum B-Type Thermal Shield Amplifier
|
||||
Pithum B-Type Kinetic Deflection Amplifier renamed to Pithum B-Type Kinetic Shield Amplifier
|
||||
Pithum B-Type EM Ward Amplifier renamed to Pithum B-Type EM Shield Amplifier
|
||||
Pithum A-Type Explosive Deflection Amplifier renamed to Pithum A-Type Explosive Shield Amplifier
|
||||
Pithum A-Type Thermal Dissipation Amplifier renamed to Pithum A-Type Thermal Shield Amplifier
|
||||
Pithum A-Type Kinetic Deflection Amplifier renamed to Pithum A-Type Kinetic Shield Amplifier
|
||||
Pithum A-Type EM Ward Amplifier renamed to Pithum A-Type EM Shield Amplifier
|
||||
Gistum C-Type Explosive Deflection Amplifier renamed to Gistum C-Type Explosive Shield Amplifier
|
||||
Gistum B-Type Explosive Deflection Amplifier renamed to Gistum B-Type Explosive Shield Amplifier
|
||||
Gistum C-Type Thermal Dissipation Amplifier renamed to Gistum C-Type Thermal Shield Amplifier
|
||||
Gistum B-Type Thermal Dissipation Amplifier renamed to Gistum B-Type Thermal Shield Amplifier
|
||||
Gistum C-Type Kinetic Deflection Amplifier renamed to Gistum C-Type Kinetic Shield Amplifier
|
||||
Gistum B-Type Kinetic Deflection Amplifier renamed to Gistum B-Type Kinetic Shield Amplifier
|
||||
Gistum C-Type EM Ward Amplifier renamed to Gistum C-Type EM Shield Amplifier
|
||||
Gistum B-Type EM Ward Amplifier renamed to Gistum B-Type EM Shield Amplifier
|
||||
Gistum A-Type Explosive Deflection Amplifier renamed to Gistum A-Type Explosive Shield Amplifier
|
||||
Gistum A-Type Thermal Dissipation Amplifier renamed to Gistum A-Type Thermal Shield Amplifier
|
||||
Gistum A-Type Kinetic Deflection Amplifier renamed to Gistum A-Type Kinetic Shield Amplifier
|
||||
Gistum A-Type EM Ward Amplifier renamed to Gistum A-Type EM Shield Amplifier
|
||||
'Whiskey' Explosive Deflection Amplifier renamed to 'Whiskey' Explosive Shield Amplifier
|
||||
'High Noon' Thermal Dissipation Amplifier renamed to 'High Noon' Thermal Shield Amplifier
|
||||
'Cactus' Modified Kinetic Deflection Amplifier renamed to 'Cactus' Modified Kinetic Shield Amplifier
|
||||
'Prospector' EM Ward Amplifier renamed to 'Prospector' EM Shield Amplifier
|
||||
Limited Layered Plating I converted to Upgraded Layered Coating I
|
||||
'Scarab' Layered Plating I converted to Upgraded Layered Coating I
|
||||
'Grail' Layered Plating I converted to Upgraded Layered Coating I
|
||||
Limited Adaptive Nano Plating I converted to Upgraded Multispectrum Coating I
|
||||
'Collateral' Adaptive Nano Plating I converted to Upgraded Multispectrum Coating I
|
||||
'Refuge' Adaptive Nano Plating I converted to Upgraded Multispectrum Coating I
|
||||
Limited EM Plating I converted to Upgraded EM Coating I
|
||||
'Contour' EM Plating I converted to Upgraded EM Coating I
|
||||
'Spiegel' EM Plating I converted to Upgraded EM Coating I
|
||||
Limited Explosive Plating I converted to Upgraded Explosive Coating I
|
||||
Experimental Explosive Plating I converted to Upgraded Explosive Coating I
|
||||
'Aegis' Explosive Plating I converted to Upgraded Explosive Coating I
|
||||
Limited Kinetic Plating I converted to Upgraded Kinetic Coating I
|
||||
Experimental Kinetic Plating I converted to Upgraded Kinetic Coating I
|
||||
'Element' Kinetic Plating I converted to Upgraded Kinetic Coating I
|
||||
Limited Thermal Plating I converted to Upgraded Thermal Coating I
|
||||
Experimental Thermal Plating I converted to Upgraded Thermal Coating I
|
||||
Prototype Thermal Plating I converted to Upgraded Thermal Coating I
|
||||
Basic EM Plating renamed to 'Basic' EM Coating
|
||||
EM Plating I renamed to EM Coating I
|
||||
EM Plating II renamed to EM Coating II
|
||||
Basic Explosive Plating renamed to 'Basic' Explosive Coating
|
||||
Explosive Plating I renamed to Explosive Coating I
|
||||
Explosive Plating II renamed to Explosive Coating II
|
||||
Basic Layered Plating renamed to 'Basic' Layered Coating
|
||||
Layered Plating I renamed to Layered Coating I
|
||||
Layered Plating II renamed to Layered Coating II
|
||||
Basic Kinetic Plating renamed to 'Basic' Kinetic Coating
|
||||
Kinetic Plating I renamed to Kinetic Coating I
|
||||
Kinetic Plating II renamed to Kinetic Coating II
|
||||
Basic Thermal Plating renamed to 'Basic' Thermal Coating
|
||||
Thermal Plating I renamed to Thermal Coating I
|
||||
Thermal Plating II renamed to Thermal Coating II
|
||||
Basic Adaptive Nano Plating renamed to 'Basic' Multispectrum Coating
|
||||
Adaptive Nano Plating I renamed to Multispectrum Coating I
|
||||
Adaptive Nano Plating II renamed to Multispectrum Coating II
|
||||
Domination Adaptive Nano Plating renamed to Domination Multispectrum Coating
|
||||
True Sansha Adaptive Nano Plating renamed to True Sansha Multispectrum Coating
|
||||
Dark Blood Adaptive Nano Plating renamed to Dark Blood Multispectrum Coating
|
||||
Domination Kinetic Plating renamed to Domination Kinetic Coating
|
||||
True Sansha Kinetic Plating renamed to True Sansha Kinetic Coating
|
||||
Dark Blood Kinetic Plating renamed to Dark Blood Kinetic Coating
|
||||
Domination Explosive Plating renamed to Domination Explosive Coating
|
||||
True Sansha Explosive Plating renamed to True Sansha Explosive Coating
|
||||
Dark Blood Explosive Plating renamed to Dark Blood Explosive Coating
|
||||
Domination EM Plating renamed to Domination EM Coating
|
||||
True Sansha EM Plating renamed to True Sansha EM Coating
|
||||
Dark Blood EM Plating renamed to Dark Blood EM Coating
|
||||
Domination Thermal Plating renamed to Domination Thermal Coating
|
||||
True Sansha Thermal Plating renamed to True Sansha Thermal Coating
|
||||
Dark Blood Thermal Plating renamed to Dark Blood Thermal Coating
|
||||
Shadow Serpentis Adaptive Nano Plating renamed to Shadow Serpentis Multispectrum Coating
|
||||
Shadow Serpentis Kinetic Plating renamed to Shadow Serpentis Kinetic Coating
|
||||
Shadow Serpentis Explosive Plating renamed to Shadow Serpentis Explosive Coating
|
||||
Shadow Serpentis EM Plating renamed to Shadow Serpentis EM Coating
|
||||
Shadow Serpentis Thermal Plating renamed to Shadow Serpentis Thermal Coating
|
||||
Mizuro's Modified Adaptive Nano Plating renamed to Mizuro's Modified Multispectrum Coating
|
||||
Gotan's Modified Adaptive Nano Plating renamed to Gotan's Modified Multispectrum Coating
|
||||
Mizuro's Modified Kinetic Plating renamed to Mizuro's Modified Kinetic Coating
|
||||
Gotan's Modified Kinetic Plating renamed to Gotan's Modified Kinetic Coating
|
||||
Mizuro's Modified Explosive Plating renamed to Mizuro's Modified Explosive Coating
|
||||
Gotan's Modified Explosive Plating renamed to Gotan's Modified Explosive Coating
|
||||
Mizuro's Modified EM Plating renamed to Mizuro's Modified EM Coating
|
||||
Gotan's Modified EM Plating renamed to Gotan's Modified EM Coating
|
||||
Mizuro's Modified Thermal Plating renamed to Mizuro's Modified Thermal Coating
|
||||
Gotan's Modified Thermal Plating renamed to Gotan's Modified Thermal Coating
|
||||
Brokara's Modified Adaptive Nano Plating renamed to Brokara's Modified Multispectrum Coating
|
||||
Tairei's Modified Adaptive Nano Plating renamed to Tairei's Modified Multispectrum Coating
|
||||
Selynne's Modified Adaptive Nano Plating renamed to Selynne's Modified Multispectrum Coating
|
||||
Raysere's Modified Adaptive Nano Plating renamed to Raysere's Modified Multispectrum Coating
|
||||
Vizan's Modified Adaptive Nano Plating renamed to Vizan's Modified Multispectrum Coating
|
||||
Ahremen's Modified Adaptive Nano Plating renamed to Ahremen's Modified Multispectrum Coating
|
||||
Chelm's Modified Adaptive Nano Plating renamed to Chelm's Modified Multispectrum Coating
|
||||
Draclira's Modified Adaptive Nano Plating renamed to Draclira's Modified Multispectrum Coating
|
||||
Brokara's Modified Kinetic Plating renamed to Brokara's Modified Kinetic Coating
|
||||
Tairei's Modified Kinetic Plating renamed to Tairei's Modified Kinetic Coating
|
||||
Selynne's Modified Kinetic Plating renamed to Selynne's Modified Kinetic Coating
|
||||
Raysere's Modified Kinetic Plating renamed to Raysere's Modified Kinetic Coating
|
||||
Vizan's Modified Kinetic Plating renamed to Vizan's Modified Kinetic Coating
|
||||
Ahremen's Modified Kinetic Plating renamed to Ahremen's Modified Kinetic Coating
|
||||
Chelm's Modified Kinetic Plating renamed to Chelm's Modified Kinetic Coating
|
||||
Draclira's Modified Kinetic Plating renamed to Draclira's Modified Kinetic Coating
|
||||
Brokara's Modified Explosive Plating renamed to Brokara's Modified Explosive Coating
|
||||
Tairei's Modified Explosive Plating renamed to Tairei's Modified Explosive Coating
|
||||
Selynne's Modified Explosive Plating renamed to Selynne's Modified Explosive Coating
|
||||
Raysere's Modified Explosive Plating renamed to Raysere's Modified Explosive Coating
|
||||
Vizan's Modified Explosive Plating renamed to Vizan's Modified Explosive Coating
|
||||
Ahremen's Modified Explosive Plating renamed to Ahremen's Modified Explosive Coating
|
||||
Chelm's Modified Explosive Plating renamed to Chelm's Modified Explosive Coating
|
||||
Draclira's Modified Explosive Plating renamed to Draclira's Modified Explosive Coating
|
||||
Brokara's Modified EM Plating renamed to Brokara's Modified EM Coating
|
||||
Tairei's Modified EM Plating renamed to Tairei's Modified EM Coating
|
||||
Selynne's Modified EM Plating renamed to Selynne's Modified EM Coating
|
||||
Raysere's Modified EM Plating renamed to Raysere's Modified EM Coating
|
||||
Vizan's Modified EM Plating renamed to Vizan's Modified EM Coating
|
||||
Ahremen's Modified EM Plating renamed to Ahremen's Modified EM Coating
|
||||
Chelm's Modified EM Plating renamed to Chelm's Modified EM Coating
|
||||
Draclira's Modified EM Plating renamed to Draclira's Modified EM Coating
|
||||
Brokara's Modified Thermal Plating renamed to Brokara's Modified Thermal Coating
|
||||
Tairei's Modified Thermal Plating renamed to Tairei's Modified Thermal Coating
|
||||
Selynne's Modified Thermal Plating renamed to Selynne's Modified Thermal Coating
|
||||
Raysere's Modified Thermal Plating renamed to Raysere's Modified Thermal Coating
|
||||
Vizan's Modified Thermal Plating renamed to Vizan's Modified Thermal Coating
|
||||
Ahremen's Modified Thermal Plating renamed to Ahremen's Modified Thermal Coating
|
||||
Chelm's Modified Thermal Plating renamed to Chelm's Modified Thermal Coating
|
||||
Draclira's Modified Thermal Plating renamed to Draclira's Modified Thermal Coating
|
||||
Brynn's Modified Adaptive Nano Plating renamed to Brynn's Modified Multispectrum Coating
|
||||
Tuvan's Modified Adaptive Nano Plating renamed to Tuvan's Modified Multispectrum Coating
|
||||
Setele's Modified Adaptive Nano Plating renamed to Setele's Modified Multispectrum Coating
|
||||
Cormack's Modified Adaptive Nano Plating renamed to Cormack's Modified Multispectrum Coating
|
||||
Brynn's Modified Thermal Plating renamed to Brynn's Modified Thermal Coating
|
||||
Tuvan's Modified Thermal Plating renamed to Tuvan's Modified Thermal Coating
|
||||
Setele's Modified Thermal Plating renamed to Setele's Modified Thermal Coating
|
||||
Cormack's Modified Thermal Plating renamed to Cormack's Modified Thermal Coating
|
||||
Brynn's Modified EM Plating renamed to Brynn's Modified EM Coating
|
||||
Tuvan's Modified EM Plating renamed to Tuvan's Modified EM Coating
|
||||
Setele's Modified EM Plating renamed to Setele's Modified EM Coating
|
||||
Cormack's Modified EM Plating renamed to Cormack's Modified EM Coating
|
||||
Brynn's Modified Explosive Plating renamed to Brynn's Modified Explosive Coating
|
||||
Tuvan's Modified Explosive Plating renamed to Tuvan's Modified Explosive Coating
|
||||
Setele's Modified Explosive Plating renamed to Setele's Modified Explosive Coating
|
||||
Cormack's Modified Explosive Plating renamed to Cormack's Modified Explosive Coating
|
||||
Brynn's Modified Kinetic Plating renamed to Brynn's Modified Kinetic Coating
|
||||
Tuvan's Modified Kinetic Plating renamed to Tuvan's Modified Kinetic Coating
|
||||
Setele's Modified Kinetic Plating renamed to Setele's Modified Kinetic Coating
|
||||
Cormack's Modified Kinetic Plating renamed to Cormack's Modified Kinetic Coating
|
||||
Imperial Navy Thermal Plating renamed to Imperial Navy Thermal Coating
|
||||
Imperial Navy EM Plating renamed to Imperial Navy EM Coating
|
||||
Imperial Navy Explosive Plating renamed to Imperial Navy Explosive Coating
|
||||
Imperial Navy Kinetic Plating renamed to Imperial Navy Kinetic Coating
|
||||
Imperial Navy Adaptive Nano Plating renamed to Imperial Navy Multispectrum Coating
|
||||
Republic Fleet Thermal Plating renamed to Republic Fleet Thermal Coating
|
||||
Republic Fleet EM Plating renamed to Republic Fleet EM Coating
|
||||
Republic Fleet Explosive Plating renamed to Republic Fleet Explosive Coating
|
||||
Republic Fleet Kinetic Plating renamed to Republic Fleet Kinetic Coating
|
||||
Republic Fleet Adaptive Nano Plating renamed to Republic Fleet Multispectrum Coating
|
||||
Upgraded Adaptive Nano Plating I renamed to Upgraded Multispectrum Coating I
|
||||
Upgraded Kinetic Plating I renamed to Upgraded Kinetic Coating I
|
||||
Upgraded Explosive Plating I renamed to Upgraded Explosive Coating I
|
||||
Upgraded EM Plating I renamed to Upgraded EM Coating I
|
||||
Upgraded Thermal Plating I renamed to Upgraded Thermal Coating I
|
||||
Upgraded Layered Plating I renamed to Upgraded Layered Coating I
|
||||
Ammatar Navy Kinetic Plating renamed to Ammatar Navy Kinetic Coating
|
||||
Ammatar Navy Adaptive Nano Plating renamed to Ammatar Navy Multispectrum Coating
|
||||
Ammatar Navy Explosive Plating renamed to Ammatar Navy Explosive Coating
|
||||
Ammatar Navy EM Plating renamed to Ammatar Navy EM Coating
|
||||
Federation Navy Adaptive Nano Plating renamed to Federation Navy Multispectrum Coating
|
||||
Federation Navy Kinetic Plating renamed to Federation Navy Kinetic Coating
|
||||
Federation Navy Explosive Plating renamed to Federation Navy Explosive Coating
|
||||
Federation Navy EM Plating renamed to Federation Navy EM Coating
|
||||
Federation Navy Thermal Plating renamed to Federation Navy Thermal Coating
|
||||
Corpii C-Type Adaptive Nano Plating renamed to Corpii C-Type Multispectrum Coating
|
||||
Centii C-Type Adaptive Nano Plating renamed to Centii C-Type Multispectrum Coating
|
||||
Corpii B-Type Adaptive Nano Plating renamed to Corpii B-Type Multispectrum Coating
|
||||
Centii B-Type Adaptive Nano Plating renamed to Centii B-Type Multispectrum Coating
|
||||
Corpii A-Type Adaptive Nano Plating renamed to Corpii A-Type Multispectrum Coating
|
||||
Centii A-Type Adaptive Nano Plating renamed to Centii A-Type Multispectrum Coating
|
||||
Corpii C-Type Kinetic Plating renamed to Corpii C-Type Kinetic Coating
|
||||
Centii C-Type Kinetic Plating renamed to Centii C-Type Kinetic Coating
|
||||
Corpii C-Type Explosive Plating renamed to Corpii C-Type Explosive Coating
|
||||
Centii C-Type Explosive Plating renamed to Centii C-Type Explosive Coating
|
||||
Corpii C-Type EM Plating renamed to Corpii C-Type EM Coating
|
||||
Centii C-Type EM Plating renamed to Centii C-Type EM Coating
|
||||
Corpii C-Type Thermal Plating renamed to Corpii C-Type Thermal Coating
|
||||
Centii C-Type Thermal Plating renamed to Centii C-Type Thermal Coating
|
||||
Corpii B-Type Thermal Plating renamed to Corpii B-Type Thermal Coating
|
||||
Centii B-Type Thermal Plating renamed to Centii B-Type Thermal Coating
|
||||
Corpii B-Type Kinetic Plating renamed to Corpii B-Type Kinetic Coating
|
||||
Centii B-Type Kinetic Plating renamed to Centii B-Type Kinetic Coating
|
||||
Corpii B-Type Explosive Plating renamed to Corpii B-Type Explosive Coating
|
||||
Centii B-Type Explosive Plating renamed to Centii B-Type Explosive Coating
|
||||
Corpii B-Type EM Plating renamed to Corpii B-Type EM Coating
|
||||
Centii B-Type EM Plating renamed to Centii B-Type EM Coating
|
||||
Corpii A-Type Kinetic Plating renamed to Corpii A-Type Kinetic Coating
|
||||
Centii A-Type Kinetic Plating renamed to Centii A-Type Kinetic Coating
|
||||
Corpii A-Type Explosive Plating renamed to Corpii A-Type Explosive Coating
|
||||
Centii A-Type Explosive Plating renamed to Centii A-Type Explosive Coating
|
||||
Corpii A-Type EM Plating renamed to Corpii A-Type EM Coating
|
||||
Centii A-Type EM Plating renamed to Centii A-Type EM Coating
|
||||
Corpii A-Type Thermal Plating renamed to Corpii A-Type Thermal Coating
|
||||
Centii A-Type Thermal Plating renamed to Centii A-Type Thermal Coating
|
||||
Coreli C-Type Adaptive Nano Plating renamed to Coreli C-Type Multispectrum Coating
|
||||
Coreli C-Type Kinetic Plating renamed to Coreli C-Type Kinetic Coating
|
||||
Coreli C-Type Explosive Plating renamed to Coreli C-Type Explosive Coating
|
||||
Coreli C-Type EM Plating renamed to Coreli C-Type EM Coating
|
||||
Coreli C-Type Thermal Plating renamed to Coreli C-Type Thermal Coating
|
||||
Coreli B-Type Adaptive Nano Plating renamed to Coreli B-Type Multispectrum Coating
|
||||
Coreli B-Type Kinetic Plating renamed to Coreli B-Type Kinetic Coating
|
||||
Coreli B-Type Explosive Plating renamed to Coreli B-Type Explosive Coating
|
||||
Coreli B-Type EM Plating renamed to Coreli B-Type EM Coating
|
||||
Coreli B-Type Thermal Plating renamed to Coreli B-Type Thermal Coating
|
||||
Coreli A-Type Adaptive Nano Plating renamed to Coreli A-Type Multispectrum Coating
|
||||
Coreli A-Type Kinetic Plating renamed to Coreli A-Type Kinetic Coating
|
||||
Coreli A-Type Explosive Plating renamed to Coreli A-Type Explosive Coating
|
||||
Coreli A-Type EM Plating renamed to Coreli A-Type EM Coating
|
||||
Coreli A-Type Thermal Plating renamed to Coreli A-Type Thermal Coating
|
||||
Khanid Navy Adaptive Nano Plating renamed to Khanid Navy Multispectrum Coating
|
||||
Khanid Navy Kinetic Plating renamed to Khanid Navy Kinetic Coating
|
||||
Khanid Navy Explosive Plating renamed to Khanid Navy Explosive Coating
|
||||
Khanid Navy EM Plating renamed to Khanid Navy EM Coating
|
||||
Khanid Navy Thermal Plating renamed to Khanid Navy Thermal Coating
|
||||
Ammatar Navy Thermal Plating renamed to Ammatar Navy Thermal Coating
|
||||
Low-Grade Mimesis Alpha renamed to Low-grade Mimesis Alpha
|
||||
Low-Grade Mimesis Beta renamed to Low-grade Mimesis Beta
|
||||
Low-Grade Mimesis Gamma renamed to Low-grade Mimesis Gamma
|
||||
Low-Grade Mimesis Delta renamed to Low-grade Mimesis Delta
|
||||
Low-Grade Mimesis Epsilon renamed to Low-grade Mimesis Epsilon
|
||||
Low-Grade Mimesis Omega renamed to Low-grade Mimesis Omega
|
||||
Mid-Grade Mimesis Alpha renamed to Mid-grade Mimesis Alpha
|
||||
Mid-Grade Mimesis Beta renamed to Mid-grade Mimesis Beta
|
||||
Mid-Grade Mimesis Gamma renamed to Mid-grade Mimesis Gamma
|
||||
Mid-Grade Mimesis Delta renamed to Mid-grade Mimesis Delta
|
||||
Mid-Grade Mimesis Epsilon renamed to Mid-grade Mimesis Epsilon
|
||||
Mid-Grade Mimesis Omega renamed to Mid-grade Mimesis Omega
|
||||
High-Grade Mimesis Alpha renamed to High-grade Mimesis Alpha
|
||||
High-Grade Mimesis Beta renamed to High-grade Mimesis Beta
|
||||
High-Grade Mimesis Delta renamed to High-grade Mimesis Delta
|
||||
High-Grade Mimesis Epsilon renamed to High-grade Mimesis Epsilon
|
||||
High-Grade Mimesis Gamma renamed to High-grade Mimesis Gamma
|
||||
High-Grade Mimesis Omega renamed to High-grade Mimesis Omega
|
||||
"""
|
||||
|
||||
def main(old, new):
|
||||
|
||||
228
service/conversions/releaseJul2020.py
Normal file
228
service/conversions/releaseJul2020.py
Normal file
@@ -0,0 +1,228 @@
|
||||
"""
|
||||
Conversion pack for May 2020 release
|
||||
"""
|
||||
|
||||
CONVERSIONS = {
|
||||
# Renamed items, extracted via diff file
|
||||
"Basic EM Plating": "'Basic' EM Coating",
|
||||
"EM Plating I": "EM Coating I",
|
||||
"EM Plating II": "EM Coating II",
|
||||
"Basic Explosive Plating": "'Basic' Explosive Coating",
|
||||
"Explosive Plating I": "Explosive Coating I",
|
||||
"Explosive Plating II": "Explosive Coating II",
|
||||
"Basic Layered Plating": "'Basic' Layered Coating",
|
||||
"Layered Plating I": "Layered Coating I",
|
||||
"Layered Plating II": "Layered Coating II",
|
||||
"Basic Kinetic Plating": "'Basic' Kinetic Coating",
|
||||
"Kinetic Plating I": "Kinetic Coating I",
|
||||
"Kinetic Plating II": "Kinetic Coating II",
|
||||
"Basic Thermal Plating": "'Basic' Thermal Coating",
|
||||
"Thermal Plating I": "Thermal Coating I",
|
||||
"Thermal Plating II": "Thermal Coating II",
|
||||
"Basic Adaptive Nano Plating": "'Basic' Multispectrum Coating",
|
||||
"Adaptive Nano Plating I": "Multispectrum Coating I",
|
||||
"Adaptive Nano Plating II": "Multispectrum Coating II",
|
||||
"Domination Adaptive Nano Plating": "Domination Multispectrum Coating",
|
||||
"True Sansha Adaptive Nano Plating": "True Sansha Multispectrum Coating",
|
||||
"Dark Blood Adaptive Nano Plating": "Dark Blood Multispectrum Coating",
|
||||
"Domination Kinetic Plating": "Domination Kinetic Coating",
|
||||
"True Sansha Kinetic Plating": "True Sansha Kinetic Coating",
|
||||
"Dark Blood Kinetic Plating": "Dark Blood Kinetic Coating",
|
||||
"Domination Explosive Plating": "Domination Explosive Coating",
|
||||
"True Sansha Explosive Plating": "True Sansha Explosive Coating",
|
||||
"Dark Blood Explosive Plating": "Dark Blood Explosive Coating",
|
||||
"Domination EM Plating": "Domination EM Coating",
|
||||
"True Sansha EM Plating": "True Sansha EM Coating",
|
||||
"Dark Blood EM Plating": "Dark Blood EM Coating",
|
||||
"Domination Thermal Plating": "Domination Thermal Coating",
|
||||
"True Sansha Thermal Plating": "True Sansha Thermal Coating",
|
||||
"Dark Blood Thermal Plating": "Dark Blood Thermal Coating",
|
||||
"Shadow Serpentis Adaptive Nano Plating": "Shadow Serpentis Multispectrum Coating",
|
||||
"Shadow Serpentis Kinetic Plating": "Shadow Serpentis Kinetic Coating",
|
||||
"Shadow Serpentis Explosive Plating": "Shadow Serpentis Explosive Coating",
|
||||
"Shadow Serpentis EM Plating": "Shadow Serpentis EM Coating",
|
||||
"Shadow Serpentis Thermal Plating": "Shadow Serpentis Thermal Coating",
|
||||
"Mizuro's Modified Adaptive Nano Plating": "Mizuro's Modified Multispectrum Coating",
|
||||
"Gotan's Modified Adaptive Nano Plating": "Gotan's Modified Multispectrum Coating",
|
||||
"Mizuro's Modified Kinetic Plating": "Mizuro's Modified Kinetic Coating",
|
||||
"Gotan's Modified Kinetic Plating": "Gotan's Modified Kinetic Coating",
|
||||
"Mizuro's Modified Explosive Plating": "Mizuro's Modified Explosive Coating",
|
||||
"Gotan's Modified Explosive Plating": "Gotan's Modified Explosive Coating",
|
||||
"Mizuro's Modified EM Plating": "Mizuro's Modified EM Coating",
|
||||
"Gotan's Modified EM Plating": "Gotan's Modified EM Coating",
|
||||
"Mizuro's Modified Thermal Plating": "Mizuro's Modified Thermal Coating",
|
||||
"Gotan's Modified Thermal Plating": "Gotan's Modified Thermal Coating",
|
||||
"Brokara's Modified Adaptive Nano Plating": "Brokara's Modified Multispectrum Coating",
|
||||
"Tairei's Modified Adaptive Nano Plating": "Tairei's Modified Multispectrum Coating",
|
||||
"Selynne's Modified Adaptive Nano Plating": "Selynne's Modified Multispectrum Coating",
|
||||
"Raysere's Modified Adaptive Nano Plating": "Raysere's Modified Multispectrum Coating",
|
||||
"Vizan's Modified Adaptive Nano Plating": "Vizan's Modified Multispectrum Coating",
|
||||
"Ahremen's Modified Adaptive Nano Plating": "Ahremen's Modified Multispectrum Coating",
|
||||
"Chelm's Modified Adaptive Nano Plating": "Chelm's Modified Multispectrum Coating",
|
||||
"Draclira's Modified Adaptive Nano Plating": "Draclira's Modified Multispectrum Coating",
|
||||
"Brokara's Modified Kinetic Plating": "Brokara's Modified Kinetic Coating",
|
||||
"Tairei's Modified Kinetic Plating": "Tairei's Modified Kinetic Coating",
|
||||
"Selynne's Modified Kinetic Plating": "Selynne's Modified Kinetic Coating",
|
||||
"Raysere's Modified Kinetic Plating": "Raysere's Modified Kinetic Coating",
|
||||
"Vizan's Modified Kinetic Plating": "Vizan's Modified Kinetic Coating",
|
||||
"Ahremen's Modified Kinetic Plating": "Ahremen's Modified Kinetic Coating",
|
||||
"Chelm's Modified Kinetic Plating": "Chelm's Modified Kinetic Coating",
|
||||
"Draclira's Modified Kinetic Plating": "Draclira's Modified Kinetic Coating",
|
||||
"Brokara's Modified Explosive Plating": "Brokara's Modified Explosive Coating",
|
||||
"Tairei's Modified Explosive Plating": "Tairei's Modified Explosive Coating",
|
||||
"Selynne's Modified Explosive Plating": "Selynne's Modified Explosive Coating",
|
||||
"Raysere's Modified Explosive Plating": "Raysere's Modified Explosive Coating",
|
||||
"Vizan's Modified Explosive Plating": "Vizan's Modified Explosive Coating",
|
||||
"Ahremen's Modified Explosive Plating": "Ahremen's Modified Explosive Coating",
|
||||
"Chelm's Modified Explosive Plating": "Chelm's Modified Explosive Coating",
|
||||
"Draclira's Modified Explosive Plating": "Draclira's Modified Explosive Coating",
|
||||
"Brokara's Modified EM Plating": "Brokara's Modified EM Coating",
|
||||
"Tairei's Modified EM Plating": "Tairei's Modified EM Coating",
|
||||
"Selynne's Modified EM Plating": "Selynne's Modified EM Coating",
|
||||
"Raysere's Modified EM Plating": "Raysere's Modified EM Coating",
|
||||
"Vizan's Modified EM Plating": "Vizan's Modified EM Coating",
|
||||
"Ahremen's Modified EM Plating": "Ahremen's Modified EM Coating",
|
||||
"Chelm's Modified EM Plating": "Chelm's Modified EM Coating",
|
||||
"Draclira's Modified EM Plating": "Draclira's Modified EM Coating",
|
||||
"Brokara's Modified Thermal Plating": "Brokara's Modified Thermal Coating",
|
||||
"Tairei's Modified Thermal Plating": "Tairei's Modified Thermal Coating",
|
||||
"Selynne's Modified Thermal Plating": "Selynne's Modified Thermal Coating",
|
||||
"Raysere's Modified Thermal Plating": "Raysere's Modified Thermal Coating",
|
||||
"Vizan's Modified Thermal Plating": "Vizan's Modified Thermal Coating",
|
||||
"Ahremen's Modified Thermal Plating": "Ahremen's Modified Thermal Coating",
|
||||
"Chelm's Modified Thermal Plating": "Chelm's Modified Thermal Coating",
|
||||
"Draclira's Modified Thermal Plating": "Draclira's Modified Thermal Coating",
|
||||
"Brynn's Modified Adaptive Nano Plating": "Brynn's Modified Multispectrum Coating",
|
||||
"Tuvan's Modified Adaptive Nano Plating": "Tuvan's Modified Multispectrum Coating",
|
||||
"Setele's Modified Adaptive Nano Plating": "Setele's Modified Multispectrum Coating",
|
||||
"Cormack's Modified Adaptive Nano Plating": "Cormack's Modified Multispectrum Coating",
|
||||
"Brynn's Modified Thermal Plating": "Brynn's Modified Thermal Coating",
|
||||
"Tuvan's Modified Thermal Plating": "Tuvan's Modified Thermal Coating",
|
||||
"Setele's Modified Thermal Plating": "Setele's Modified Thermal Coating",
|
||||
"Cormack's Modified Thermal Plating": "Cormack's Modified Thermal Coating",
|
||||
"Brynn's Modified EM Plating": "Brynn's Modified EM Coating",
|
||||
"Tuvan's Modified EM Plating": "Tuvan's Modified EM Coating",
|
||||
"Setele's Modified EM Plating": "Setele's Modified EM Coating",
|
||||
"Cormack's Modified EM Plating": "Cormack's Modified EM Coating",
|
||||
"Brynn's Modified Explosive Plating": "Brynn's Modified Explosive Coating",
|
||||
"Tuvan's Modified Explosive Plating": "Tuvan's Modified Explosive Coating",
|
||||
"Setele's Modified Explosive Plating": "Setele's Modified Explosive Coating",
|
||||
"Cormack's Modified Explosive Plating": "Cormack's Modified Explosive Coating",
|
||||
"Brynn's Modified Kinetic Plating": "Brynn's Modified Kinetic Coating",
|
||||
"Tuvan's Modified Kinetic Plating": "Tuvan's Modified Kinetic Coating",
|
||||
"Setele's Modified Kinetic Plating": "Setele's Modified Kinetic Coating",
|
||||
"Cormack's Modified Kinetic Plating": "Cormack's Modified Kinetic Coating",
|
||||
"Imperial Navy Thermal Plating": "Imperial Navy Thermal Coating",
|
||||
"Imperial Navy EM Plating": "Imperial Navy EM Coating",
|
||||
"Imperial Navy Explosive Plating": "Imperial Navy Explosive Coating",
|
||||
"Imperial Navy Kinetic Plating": "Imperial Navy Kinetic Coating",
|
||||
"Imperial Navy Adaptive Nano Plating": "Imperial Navy Multispectrum Coating",
|
||||
"Republic Fleet Thermal Plating": "Republic Fleet Thermal Coating",
|
||||
"Republic Fleet EM Plating": "Republic Fleet EM Coating",
|
||||
"Republic Fleet Explosive Plating": "Republic Fleet Explosive Coating",
|
||||
"Republic Fleet Kinetic Plating": "Republic Fleet Kinetic Coating",
|
||||
"Republic Fleet Adaptive Nano Plating": "Republic Fleet Multispectrum Coating",
|
||||
"Upgraded Adaptive Nano Plating I": "Upgraded Multispectrum Coating I",
|
||||
"Upgraded Kinetic Plating I": "Upgraded Kinetic Coating I",
|
||||
"Upgraded Explosive Plating I": "Upgraded Explosive Coating I",
|
||||
"Upgraded EM Plating I": "Upgraded EM Coating I",
|
||||
"Upgraded Thermal Plating I": "Upgraded Thermal Coating I",
|
||||
"Upgraded Layered Plating I": "Upgraded Layered Coating I",
|
||||
"Ammatar Navy Kinetic Plating": "Ammatar Navy Kinetic Coating",
|
||||
"Ammatar Navy Adaptive Nano Plating": "Ammatar Navy Multispectrum Coating",
|
||||
"Ammatar Navy Explosive Plating": "Ammatar Navy Explosive Coating",
|
||||
"Ammatar Navy EM Plating": "Ammatar Navy EM Coating",
|
||||
"Federation Navy Adaptive Nano Plating": "Federation Navy Multispectrum Coating",
|
||||
"Federation Navy Kinetic Plating": "Federation Navy Kinetic Coating",
|
||||
"Federation Navy Explosive Plating": "Federation Navy Explosive Coating",
|
||||
"Federation Navy EM Plating": "Federation Navy EM Coating",
|
||||
"Federation Navy Thermal Plating": "Federation Navy Thermal Coating",
|
||||
"Corpii C-Type Adaptive Nano Plating": "Corpii C-Type Multispectrum Coating",
|
||||
"Centii C-Type Adaptive Nano Plating": "Centii C-Type Multispectrum Coating",
|
||||
"Corpii B-Type Adaptive Nano Plating": "Corpii B-Type Multispectrum Coating",
|
||||
"Centii B-Type Adaptive Nano Plating": "Centii B-Type Multispectrum Coating",
|
||||
"Corpii A-Type Adaptive Nano Plating": "Corpii A-Type Multispectrum Coating",
|
||||
"Centii A-Type Adaptive Nano Plating": "Centii A-Type Multispectrum Coating",
|
||||
"Corpii C-Type Kinetic Plating": "Corpii C-Type Kinetic Coating",
|
||||
"Centii C-Type Kinetic Plating": "Centii C-Type Kinetic Coating",
|
||||
"Corpii C-Type Explosive Plating": "Corpii C-Type Explosive Coating",
|
||||
"Centii C-Type Explosive Plating": "Centii C-Type Explosive Coating",
|
||||
"Corpii C-Type EM Plating": "Corpii C-Type EM Coating",
|
||||
"Centii C-Type EM Plating": "Centii C-Type EM Coating",
|
||||
"Corpii C-Type Thermal Plating": "Corpii C-Type Thermal Coating",
|
||||
"Centii C-Type Thermal Plating": "Centii C-Type Thermal Coating",
|
||||
"Corpii B-Type Thermal Plating": "Corpii B-Type Thermal Coating",
|
||||
"Centii B-Type Thermal Plating": "Centii B-Type Thermal Coating",
|
||||
"Corpii B-Type Kinetic Plating": "Corpii B-Type Kinetic Coating",
|
||||
"Centii B-Type Kinetic Plating": "Centii B-Type Kinetic Coating",
|
||||
"Corpii B-Type Explosive Plating": "Corpii B-Type Explosive Coating",
|
||||
"Centii B-Type Explosive Plating": "Centii B-Type Explosive Coating",
|
||||
"Corpii B-Type EM Plating": "Corpii B-Type EM Coating",
|
||||
"Centii B-Type EM Plating": "Centii B-Type EM Coating",
|
||||
"Corpii A-Type Kinetic Plating": "Corpii A-Type Kinetic Coating",
|
||||
"Centii A-Type Kinetic Plating": "Centii A-Type Kinetic Coating",
|
||||
"Corpii A-Type Explosive Plating": "Corpii A-Type Explosive Coating",
|
||||
"Centii A-Type Explosive Plating": "Centii A-Type Explosive Coating",
|
||||
"Corpii A-Type EM Plating": "Corpii A-Type EM Coating",
|
||||
"Centii A-Type EM Plating": "Centii A-Type EM Coating",
|
||||
"Corpii A-Type Thermal Plating": "Corpii A-Type Thermal Coating",
|
||||
"Centii A-Type Thermal Plating": "Centii A-Type Thermal Coating",
|
||||
"Coreli C-Type Adaptive Nano Plating": "Coreli C-Type Multispectrum Coating",
|
||||
"Coreli C-Type Kinetic Plating": "Coreli C-Type Kinetic Coating",
|
||||
"Coreli C-Type Explosive Plating": "Coreli C-Type Explosive Coating",
|
||||
"Coreli C-Type EM Plating": "Coreli C-Type EM Coating",
|
||||
"Coreli C-Type Thermal Plating": "Coreli C-Type Thermal Coating",
|
||||
"Coreli B-Type Adaptive Nano Plating": "Coreli B-Type Multispectrum Coating",
|
||||
"Coreli B-Type Kinetic Plating": "Coreli B-Type Kinetic Coating",
|
||||
"Coreli B-Type Explosive Plating": "Coreli B-Type Explosive Coating",
|
||||
"Coreli B-Type EM Plating": "Coreli B-Type EM Coating",
|
||||
"Coreli B-Type Thermal Plating": "Coreli B-Type Thermal Coating",
|
||||
"Coreli A-Type Adaptive Nano Plating": "Coreli A-Type Multispectrum Coating",
|
||||
"Coreli A-Type Kinetic Plating": "Coreli A-Type Kinetic Coating",
|
||||
"Coreli A-Type Explosive Plating": "Coreli A-Type Explosive Coating",
|
||||
"Coreli A-Type EM Plating": "Coreli A-Type EM Coating",
|
||||
"Coreli A-Type Thermal Plating": "Coreli A-Type Thermal Coating",
|
||||
"Khanid Navy Adaptive Nano Plating": "Khanid Navy Multispectrum Coating",
|
||||
"Khanid Navy Kinetic Plating": "Khanid Navy Kinetic Coating",
|
||||
"Khanid Navy Explosive Plating": "Khanid Navy Explosive Coating",
|
||||
"Khanid Navy EM Plating": "Khanid Navy EM Coating",
|
||||
"Khanid Navy Thermal Plating": "Khanid Navy Thermal Coating",
|
||||
"Ammatar Navy Thermal Plating": "Ammatar Navy Thermal Coating",
|
||||
"Low-Grade Mimesis Alpha": "Low-grade Mimesis Alpha",
|
||||
"Low-Grade Mimesis Beta": "Low-grade Mimesis Beta",
|
||||
"Low-Grade Mimesis Gamma": "Low-grade Mimesis Gamma",
|
||||
"Low-Grade Mimesis Delta": "Low-grade Mimesis Delta",
|
||||
"Low-Grade Mimesis Epsilon": "Low-grade Mimesis Epsilon",
|
||||
"Low-Grade Mimesis Omega": "Low-grade Mimesis Omega",
|
||||
"Mid-Grade Mimesis Alpha": "Mid-grade Mimesis Alpha",
|
||||
"Mid-Grade Mimesis Beta": "Mid-grade Mimesis Beta",
|
||||
"Mid-Grade Mimesis Gamma": "Mid-grade Mimesis Gamma",
|
||||
"Mid-Grade Mimesis Delta": "Mid-grade Mimesis Delta",
|
||||
"Mid-Grade Mimesis Epsilon": "Mid-grade Mimesis Epsilon",
|
||||
"Mid-Grade Mimesis Omega": "Mid-grade Mimesis Omega",
|
||||
"High-Grade Mimesis Alpha": "High-grade Mimesis Alpha",
|
||||
"High-Grade Mimesis Beta": "High-grade Mimesis Beta",
|
||||
"High-Grade Mimesis Delta": "High-grade Mimesis Delta",
|
||||
"High-Grade Mimesis Epsilon": "High-grade Mimesis Epsilon",
|
||||
"High-Grade Mimesis Gamma": "High-grade Mimesis Gamma",
|
||||
"High-Grade Mimesis Omega": "High-grade Mimesis Omega",
|
||||
# Converted items
|
||||
"Limited Layered Plating I": "Upgraded Layered Coating I",
|
||||
"'Scarab' Layered Plating I": "Upgraded Layered Coating I",
|
||||
"'Grail' Layered Plating I": "Upgraded Layered Coating I",
|
||||
"Limited Adaptive Nano Plating I": "Upgraded Multispectrum Coating I",
|
||||
"'Collateral' Adaptive Nano Plating I": "Upgraded Multispectrum Coating I",
|
||||
"'Refuge' Adaptive Nano Plating I": "Upgraded Multispectrum Coating I",
|
||||
"Limited EM Plating I": "Upgraded EM Coating I",
|
||||
"'Contour' EM Plating I": "Upgraded EM Coating I",
|
||||
"'Spiegel' EM Plating I": "Upgraded EM Coating I",
|
||||
"Limited Explosive Plating I": "Upgraded Explosive Coating I",
|
||||
"Experimental Explosive Plating I": "Upgraded Explosive Coating I",
|
||||
"'Aegis' Explosive Plating I": "Upgraded Explosive Coating I",
|
||||
"Limited Kinetic Plating I": "Upgraded Kinetic Coating I",
|
||||
"Experimental Kinetic Plating I": "Upgraded Kinetic Coating I",
|
||||
"'Element' Kinetic Plating I": "Upgraded Kinetic Coating I",
|
||||
"Limited Thermal Plating I": "Upgraded Thermal Coating I",
|
||||
"Experimental Thermal Plating I": "Upgraded Thermal Coating I",
|
||||
"Prototype Thermal Plating I": "Upgraded Thermal Coating I"
|
||||
}
|
||||
@@ -586,7 +586,10 @@ enam: # mistype of "eanm"
|
||||
- 'energized adaptive nano membrane'
|
||||
anp:
|
||||
- 'anp'
|
||||
- 'adaptive nano plating'
|
||||
- 'multispectrum coating'
|
||||
plating:
|
||||
- 'plating'
|
||||
- 'coating'
|
||||
rah:
|
||||
- 'rah'
|
||||
- 'reactive armor hardener'
|
||||
|
||||
@@ -31,6 +31,7 @@ pyfalog = Logger(__name__)
|
||||
|
||||
|
||||
class CEveMarketBase:
|
||||
|
||||
@staticmethod
|
||||
def fetchPrices(priceMap, fetchTimeout, system=None, serenity=False):
|
||||
params = {'typeid': {typeID for typeID in priceMap}}
|
||||
@@ -52,10 +53,6 @@ class CEveMarketBase:
|
||||
except (TypeError, ValueError):
|
||||
pyfalog.warning('Failed to get price for: {0}', type_)
|
||||
continue
|
||||
|
||||
# Price is 0 if evemarketer has info on this item, but it is not available
|
||||
# for current scope limit. If we provided scope limit - make sure to skip
|
||||
# such items to check globally, and do not skip if requested globally
|
||||
if percprice == 0 and system is not None:
|
||||
continue
|
||||
priceMap[typeID].update(PriceStatus.fetchSuccess, percprice)
|
||||
@@ -63,7 +60,9 @@ class CEveMarketBase:
|
||||
|
||||
|
||||
class CEveMarketTq(CEveMarketBase):
|
||||
name = 'www.ceve-market.org (Tranquility)' #let me at last
|
||||
|
||||
name = 'ceve-market.org (Tranquility)'
|
||||
group = 'tranquility'
|
||||
|
||||
def __init__(self, priceMap, system, fetchTimeout):
|
||||
# Try selected system first
|
||||
@@ -72,8 +71,11 @@ class CEveMarketTq(CEveMarketBase):
|
||||
if priceMap:
|
||||
self.fetchPrices(priceMap, max(fetchTimeout / 3, 2), serenity=False)
|
||||
|
||||
|
||||
class CEveMarketCn(CEveMarketBase):
|
||||
name = 'www.ceve-market.org (Serenity)' #let me at last
|
||||
|
||||
name = 'ceve-market.org (Serenity)'
|
||||
group = 'serenity'
|
||||
|
||||
def __init__(self, priceMap, system, fetchTimeout):
|
||||
# Try selected system first
|
||||
@@ -82,5 +84,6 @@ class CEveMarketCn(CEveMarketBase):
|
||||
if priceMap:
|
||||
self.fetchPrices(priceMap, max(fetchTimeout / 3, 2), serenity=True)
|
||||
|
||||
|
||||
Price.register(CEveMarketCn)
|
||||
Price.register(CEveMarketTq)
|
||||
|
||||
@@ -32,6 +32,7 @@ pyfalog = Logger(__name__)
|
||||
class EveMarketData:
|
||||
|
||||
name = 'eve-marketdata.com'
|
||||
group = 'tranquility'
|
||||
|
||||
def __init__(self, priceMap, system, fetchTimeout):
|
||||
# Try selected system first
|
||||
|
||||
@@ -32,6 +32,7 @@ pyfalog = Logger(__name__)
|
||||
class EveMarketer:
|
||||
|
||||
name = 'evemarketer'
|
||||
group = 'tranquility'
|
||||
|
||||
def __init__(self, priceMap, system, fetchTimeout):
|
||||
# Try selected system first
|
||||
|
||||
@@ -38,6 +38,7 @@ systemAliases = {
|
||||
class EvePraisal:
|
||||
|
||||
name = 'evepraisal'
|
||||
group = 'tranquility'
|
||||
|
||||
def __init__(self, priceMap, system, fetchTimeout):
|
||||
# Try selected system first
|
||||
|
||||
@@ -39,6 +39,7 @@ locations = {
|
||||
class FuzzworkMarket:
|
||||
|
||||
name = 'fuzzwork market'
|
||||
group = 'tranquility'
|
||||
|
||||
def __init__(self, priceMap, system, fetchTimeout):
|
||||
# Try selected system first
|
||||
|
||||
@@ -106,6 +106,9 @@ class Price:
|
||||
# attempt to find user's selected price source, otherwise get first one
|
||||
sourceAll = list(cls.sources.keys())
|
||||
sourcePrimary = sFit.serviceFittingOptions["priceSource"] if sFit.serviceFittingOptions["priceSource"] in sourceAll else sourceAll[0]
|
||||
# When we have picked primary source, make sure to include only sources from the same group to avoid fetching
|
||||
# tranquility data for serenity or vice versa
|
||||
sourceAll = list(n for n, s in cls.sources.items() if s.group == cls.sources[sourcePrimary].group)
|
||||
|
||||
# Format: {source name: timeout weight}
|
||||
sources = {sourcePrimary: len(sourceAll)}
|
||||
|
||||
@@ -42049,6 +42049,46 @@
|
||||
"published": 0,
|
||||
"stackable": 1
|
||||
},
|
||||
"3050": {
|
||||
"attributeID": 3050,
|
||||
"dataType": 4,
|
||||
"defaultValue": 2.0,
|
||||
"description": "The amount of fleets needed for a single pvp filament match ",
|
||||
"highIsGood": 0,
|
||||
"name": "AmountOfFleetsPerMatch",
|
||||
"published": 0,
|
||||
"stackable": 0
|
||||
},
|
||||
"3051": {
|
||||
"attributeID": 3051,
|
||||
"categoryID": 17,
|
||||
"dataType": 5,
|
||||
"defaultValue": 1000.0,
|
||||
"description": "The range players in fleet need to be within fleet member doing an action",
|
||||
"displayName": "Area Effect Radius",
|
||||
"displayNameID": 564554,
|
||||
"highIsGood": 1,
|
||||
"iconID": 1391,
|
||||
"name": "FleetMemberPickupRadius",
|
||||
"published": 1,
|
||||
"stackable": 1,
|
||||
"tooltipTitleID": 564555,
|
||||
"unitID": 1
|
||||
},
|
||||
"3052": {
|
||||
"attributeID": 3052,
|
||||
"categoryID": 17,
|
||||
"dataType": 4,
|
||||
"defaultValue": 1.0,
|
||||
"description": "Amount of players in fleet needed to be valid",
|
||||
"displayName": "Number Of Ships required",
|
||||
"displayNameID": 564556,
|
||||
"highIsGood": 1,
|
||||
"iconID": 1391,
|
||||
"name": "FleetMembersNeeded",
|
||||
"published": 1,
|
||||
"stackable": 1
|
||||
},
|
||||
"3093": {
|
||||
"attributeID": 3093,
|
||||
"dataType": 4,
|
||||
|
||||
@@ -728,7 +728,7 @@
|
||||
"3394": 4
|
||||
},
|
||||
"1292": {
|
||||
"3392": 1
|
||||
"3392": 2
|
||||
},
|
||||
"1294": {
|
||||
"3394": 1
|
||||
@@ -16683,5 +16683,26 @@
|
||||
},
|
||||
"54657": {
|
||||
"3402": 1
|
||||
},
|
||||
"55747": {
|
||||
"3402": 1
|
||||
},
|
||||
"55803": {
|
||||
"3402": 1
|
||||
},
|
||||
"55804": {
|
||||
"3402": 1
|
||||
},
|
||||
"55805": {
|
||||
"3402": 1
|
||||
},
|
||||
"55806": {
|
||||
"3402": 1
|
||||
},
|
||||
"55826": {
|
||||
"3402": 1
|
||||
},
|
||||
"55859": {
|
||||
"3402": 1
|
||||
}
|
||||
}
|
||||
@@ -1 +1 @@
|
||||
version: v2.22.1
|
||||
version: v2.23.0
|
||||
|
||||
Reference in New Issue
Block a user