Compare commits
8 Commits
v2.25.1dev
...
v2.25.1dev
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bee6652cc6 | ||
|
|
047ef75960 | ||
|
|
32e57f8138 | ||
|
|
e891804b64 | ||
|
|
7d42b89726 | ||
|
|
6561996327 | ||
|
|
0d2ad6eac2 | ||
|
|
3b2bfd01c5 |
@@ -1126,6 +1126,7 @@ class Effect394(BaseEffect):
|
||||
Implants named like: grade Snake (16 of 18)
|
||||
Modules named like: Auxiliary Thrusters (8 of 8)
|
||||
Implant: Quafe Zero
|
||||
Implant: Serenity Seasonal Booster 1
|
||||
Skill: Navigation
|
||||
"""
|
||||
|
||||
@@ -35109,7 +35110,7 @@ class Effect7086(BaseEffect):
|
||||
shipbonusPCTTrackingPC2
|
||||
|
||||
Used by:
|
||||
Variations of ship: Vedmak (2 of 2)
|
||||
Ship: Ikitursa
|
||||
Ship: Tiamat
|
||||
"""
|
||||
|
||||
@@ -36955,6 +36956,22 @@ class Effect8073(BaseEffect):
|
||||
skill='Command Ships', **kwargs)
|
||||
|
||||
|
||||
class Effect8074(BaseEffect):
|
||||
"""
|
||||
shipBonusPC2maxRange
|
||||
|
||||
Used by:
|
||||
Ship: Vedmak
|
||||
"""
|
||||
|
||||
type = 'passive'
|
||||
|
||||
@staticmethod
|
||||
def handler(fit, ship, context, projectionRange, **kwargs):
|
||||
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Precursor Weapon'),
|
||||
'maxRange', ship.getModifiedItemAttr('shipBonusPC2'), skill='Precursor Cruiser', **kwargs)
|
||||
|
||||
|
||||
class Effect8075(BaseEffect):
|
||||
"""
|
||||
systemHullEmResistance
|
||||
|
||||
@@ -267,7 +267,9 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
|
||||
|
||||
@property
|
||||
def isExclusiveSystemEffect(self):
|
||||
return self.item.group.name in ("Effect Beacon", "Non-Interactable Object", "MassiveEnvironments")
|
||||
# See issue #2258
|
||||
# return self.item.group.name in ("Effect Beacon", "Non-Interactable Object", "MassiveEnvironments")
|
||||
return False
|
||||
|
||||
@property
|
||||
def isCapitalSize(self):
|
||||
|
||||
@@ -367,7 +367,7 @@ class _TabRenderer:
|
||||
width = max(width, self.min_width)
|
||||
height = max(height, self.min_height)
|
||||
|
||||
self.disabled = False
|
||||
self._disabled = False
|
||||
self.baseText = text
|
||||
self.extraText = ''
|
||||
self.tab_size = (width, height)
|
||||
@@ -383,6 +383,18 @@ class _TabRenderer:
|
||||
self.position = (0, 0) # Not used internally for rendering - helper for tab container
|
||||
self.InitTab()
|
||||
|
||||
@property
|
||||
def disabled(self):
|
||||
return self._disabled
|
||||
|
||||
@disabled.setter
|
||||
def disabled(self, value):
|
||||
if value == self._disabled: # Avoid unnecessary re-rendering
|
||||
return
|
||||
|
||||
self._disabled = value
|
||||
self._Render()
|
||||
|
||||
@property
|
||||
def text(self):
|
||||
return self.baseText + self.extraText
|
||||
@@ -931,7 +943,6 @@ class _TabsContainer(wx.Panel):
|
||||
tb_renderer = self.tabs[tab]
|
||||
tb_renderer.disabled = disabled
|
||||
|
||||
self.AdjustTabsSize()
|
||||
self.Refresh()
|
||||
|
||||
def GetSelectedTab(self):
|
||||
|
||||
@@ -79224,6 +79224,29 @@
|
||||
"published": 0,
|
||||
"rangeChance": 0
|
||||
},
|
||||
"8074": {
|
||||
"disallowAutoRepeat": 0,
|
||||
"effectCategory": 0,
|
||||
"effectID": 8074,
|
||||
"effectName": "shipBonusPC2maxRange",
|
||||
"electronicChance": 0,
|
||||
"isAssistance": 0,
|
||||
"isOffensive": 0,
|
||||
"isWarpSafe": 0,
|
||||
"modifierInfo": [
|
||||
{
|
||||
"domain": "shipID",
|
||||
"func": "LocationRequiredSkillModifier",
|
||||
"modifiedAttributeID": 54,
|
||||
"modifyingAttributeID": 2765,
|
||||
"operation": 6,
|
||||
"skillTypeID": 47871
|
||||
}
|
||||
],
|
||||
"propulsionChance": 0,
|
||||
"published": 0,
|
||||
"rangeChance": 0
|
||||
},
|
||||
"8075": {
|
||||
"disallowAutoRepeat": 0,
|
||||
"effectCategory": 7,
|
||||
|
||||
@@ -2165949,7 +2165949,7 @@
|
||||
},
|
||||
{
|
||||
"attributeID": 2765,
|
||||
"value": 5.0
|
||||
"value": 7.5
|
||||
}
|
||||
],
|
||||
"dogmaEffects": [
|
||||
@@ -2165957,10 +2165957,6 @@
|
||||
"effectID": 7085,
|
||||
"isDefault": 0
|
||||
},
|
||||
{
|
||||
"effectID": 7086,
|
||||
"isDefault": 0
|
||||
},
|
||||
{
|
||||
"effectID": 7092,
|
||||
"isDefault": 0
|
||||
@@ -2165976,6 +2165972,10 @@
|
||||
{
|
||||
"effectID": 7112,
|
||||
"isDefault": 0
|
||||
},
|
||||
{
|
||||
"effectID": 8074,
|
||||
"isDefault": 0
|
||||
}
|
||||
]
|
||||
},
|
||||
@@ -2166019,7 +2166019,7 @@
|
||||
},
|
||||
{
|
||||
"attributeID": 37,
|
||||
"value": 113.0
|
||||
"value": 125.0
|
||||
},
|
||||
{
|
||||
"attributeID": 48,
|
||||
@@ -2237096,7 +2237096,7 @@
|
||||
},
|
||||
{
|
||||
"attributeID": 283,
|
||||
"value": 125.0
|
||||
"value": 75.0
|
||||
},
|
||||
{
|
||||
"attributeID": 422,
|
||||
@@ -2237200,7 +2237200,7 @@
|
||||
},
|
||||
{
|
||||
"attributeID": 1271,
|
||||
"value": 75.0
|
||||
"value": 50.0
|
||||
},
|
||||
{
|
||||
"attributeID": 1281,
|
||||
@@ -2251343,7 +2251343,7 @@
|
||||
},
|
||||
{
|
||||
"attributeID": 37,
|
||||
"value": 318.0
|
||||
"value": 325.0
|
||||
},
|
||||
{
|
||||
"attributeID": 48,
|
||||
@@ -2251651,7 +2251651,7 @@
|
||||
},
|
||||
{
|
||||
"attributeID": 2800,
|
||||
"value": 15.0
|
||||
"value": 30.0
|
||||
}
|
||||
],
|
||||
"dogmaEffects": [
|
||||
@@ -2271716,7 +2271716,7 @@
|
||||
},
|
||||
{
|
||||
"attributeID": 116,
|
||||
"value": 644.0
|
||||
"value": 1610.0
|
||||
},
|
||||
{
|
||||
"attributeID": 117,
|
||||
@@ -2271724,7 +2271724,7 @@
|
||||
},
|
||||
{
|
||||
"attributeID": 118,
|
||||
"value": 980.0
|
||||
"value": 2450.0
|
||||
},
|
||||
{
|
||||
"attributeID": 120,
|
||||
@@ -2283850,7 +2283850,7 @@
|
||||
},
|
||||
{
|
||||
"attributeID": 116,
|
||||
"value": 532.0
|
||||
"value": 1330.0
|
||||
},
|
||||
{
|
||||
"attributeID": 117,
|
||||
@@ -2283858,7 +2283858,7 @@
|
||||
},
|
||||
{
|
||||
"attributeID": 118,
|
||||
"value": 1204.0
|
||||
"value": 3010.0
|
||||
},
|
||||
{
|
||||
"attributeID": 120,
|
||||
@@ -2283936,7 +2283936,7 @@
|
||||
},
|
||||
{
|
||||
"attributeID": 116,
|
||||
"value": 476.0
|
||||
"value": 1190.0
|
||||
},
|
||||
{
|
||||
"attributeID": 117,
|
||||
@@ -2283944,7 +2283944,7 @@
|
||||
},
|
||||
{
|
||||
"attributeID": 118,
|
||||
"value": 756.0
|
||||
"value": 1890.0
|
||||
},
|
||||
{
|
||||
"attributeID": 120,
|
||||
@@ -2379993,5 +2379993,71 @@
|
||||
"isDefault": 0
|
||||
}
|
||||
]
|
||||
},
|
||||
"56125": {
|
||||
"dogmaAttributes": [
|
||||
{
|
||||
"attributeID": 175,
|
||||
"value": 5.0
|
||||
},
|
||||
{
|
||||
"attributeID": 176,
|
||||
"value": 5.0
|
||||
},
|
||||
{
|
||||
"attributeID": 177,
|
||||
"value": 5.0
|
||||
},
|
||||
{
|
||||
"attributeID": 178,
|
||||
"value": 5.0
|
||||
},
|
||||
{
|
||||
"attributeID": 179,
|
||||
"value": 5.0
|
||||
},
|
||||
{
|
||||
"attributeID": 315,
|
||||
"value": 5.0
|
||||
},
|
||||
{
|
||||
"attributeID": 330,
|
||||
"value": 86400000.0
|
||||
},
|
||||
{
|
||||
"attributeID": 1087,
|
||||
"value": 31.0
|
||||
},
|
||||
{
|
||||
"attributeID": 2422,
|
||||
"value": 18506.166666666668
|
||||
}
|
||||
],
|
||||
"dogmaEffects": [
|
||||
{
|
||||
"effectID": 302,
|
||||
"isDefault": 0
|
||||
},
|
||||
{
|
||||
"effectID": 304,
|
||||
"isDefault": 0
|
||||
},
|
||||
{
|
||||
"effectID": 306,
|
||||
"isDefault": 0
|
||||
},
|
||||
{
|
||||
"effectID": 308,
|
||||
"isDefault": 0
|
||||
},
|
||||
{
|
||||
"effectID": 310,
|
||||
"isDefault": 0
|
||||
},
|
||||
{
|
||||
"effectID": 394,
|
||||
"isDefault": 0
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
@@ -540206,6 +540206,7 @@
|
||||
"factionID": 500026,
|
||||
"graphicID": 21976,
|
||||
"groupID": 26,
|
||||
"isDynamicType": false,
|
||||
"isisGroupID": 16,
|
||||
"marketGroupID": 2428,
|
||||
"mass": 9530000.0,
|
||||
@@ -540235,7 +540236,7 @@
|
||||
"isDynamicType": false,
|
||||
"isisGroupID": 26,
|
||||
"marketGroupID": 2430,
|
||||
"mass": 63000000.0,
|
||||
"mass": 78000000.0,
|
||||
"metaLevel": 0,
|
||||
"portionSize": 1,
|
||||
"published": true,
|
||||
@@ -573126,7 +573127,7 @@
|
||||
"isDynamicType": false,
|
||||
"isisGroupID": 14,
|
||||
"marketGroupID": 2523,
|
||||
"mass": 1350000.0,
|
||||
"mass": 1560000.0,
|
||||
"metaGroupID": 1,
|
||||
"metaLevel": 0,
|
||||
"portionSize": 1,
|
||||
@@ -573153,7 +573154,7 @@
|
||||
"isDynamicType": false,
|
||||
"isisGroupID": 23,
|
||||
"marketGroupID": 2525,
|
||||
"mass": 9900000.0,
|
||||
"mass": 10700000.0,
|
||||
"metaLevel": 0,
|
||||
"portionSize": 1,
|
||||
"published": true,
|
||||
@@ -625440,7 +625441,7 @@
|
||||
"raceID": 1,
|
||||
"radius": 1.0,
|
||||
"typeID": 56047,
|
||||
"typeName": "Weak Metaliminal Dark Storm Enviroment",
|
||||
"typeName": "Weak Metaliminal Dark Storm Environment",
|
||||
"typeNameID": 568959,
|
||||
"volume": 0.0
|
||||
},
|
||||
@@ -625456,7 +625457,7 @@
|
||||
"raceID": 1,
|
||||
"radius": 1.0,
|
||||
"typeID": 56048,
|
||||
"typeName": "Strong Metaliminal Dark Storm Enviroment",
|
||||
"typeName": "Strong Metaliminal Dark Storm Environment",
|
||||
"typeNameID": 568960,
|
||||
"volume": 0.0
|
||||
},
|
||||
@@ -625472,7 +625473,7 @@
|
||||
"raceID": 1,
|
||||
"radius": 1.0,
|
||||
"typeID": 56049,
|
||||
"typeName": "Weak Metaliminal Electrical Storm Enviroment",
|
||||
"typeName": "Weak Metaliminal Electrical Storm Environment",
|
||||
"typeNameID": 568961,
|
||||
"volume": 0.0
|
||||
},
|
||||
@@ -625488,7 +625489,7 @@
|
||||
"raceID": 1,
|
||||
"radius": 1.0,
|
||||
"typeID": 56050,
|
||||
"typeName": "Strong Metaliminal Electrical Storm Enviroment",
|
||||
"typeName": "Strong Metaliminal Electrical Storm Environment",
|
||||
"typeNameID": 568962,
|
||||
"volume": 0.0
|
||||
},
|
||||
@@ -625504,7 +625505,7 @@
|
||||
"raceID": 1,
|
||||
"radius": 1.0,
|
||||
"typeID": 56051,
|
||||
"typeName": "Weak Metaliminal Exotic Matter Storm Enviroment",
|
||||
"typeName": "Weak Metaliminal Exotic Matter Storm Environment",
|
||||
"typeNameID": 568963,
|
||||
"volume": 0.0
|
||||
},
|
||||
@@ -625520,7 +625521,7 @@
|
||||
"raceID": 1,
|
||||
"radius": 1.0,
|
||||
"typeID": 56052,
|
||||
"typeName": "Strong Metaliminal Exotic Matter Storm Enviroment",
|
||||
"typeName": "Strong Metaliminal Exotic Matter Storm Environment",
|
||||
"typeNameID": 568964,
|
||||
"volume": 0.0
|
||||
},
|
||||
@@ -625536,7 +625537,7 @@
|
||||
"raceID": 1,
|
||||
"radius": 1.0,
|
||||
"typeID": 56053,
|
||||
"typeName": "Weak Metaliminal Gamma Ray Storm Enviroment",
|
||||
"typeName": "Weak Metaliminal Gamma Ray Storm Environment",
|
||||
"typeNameID": 568965,
|
||||
"volume": 0.0
|
||||
},
|
||||
@@ -625552,7 +625553,7 @@
|
||||
"raceID": 1,
|
||||
"radius": 1.0,
|
||||
"typeID": 56054,
|
||||
"typeName": "Strong Metaliminal Gamma Ray Storm Enviroment",
|
||||
"typeName": "Strong Metaliminal Gamma Ray Storm Environment",
|
||||
"typeNameID": 568966,
|
||||
"volume": 0.0
|
||||
},
|
||||
@@ -625568,7 +625569,7 @@
|
||||
"raceID": 1,
|
||||
"radius": 1.0,
|
||||
"typeID": 56055,
|
||||
"typeName": "Weak Metaliminal Plasma Firestorm Enviroment",
|
||||
"typeName": "Weak Metaliminal Plasma Firestorm Environment",
|
||||
"typeNameID": 568967,
|
||||
"volume": 0.0
|
||||
},
|
||||
@@ -625584,7 +625585,7 @@
|
||||
"raceID": 1,
|
||||
"radius": 1.0,
|
||||
"typeID": 56056,
|
||||
"typeName": "Strong Metaliminal Plasma Firestorm Enviroment",
|
||||
"typeName": "Strong Metaliminal Plasma Firestorm Environment",
|
||||
"typeNameID": 568968,
|
||||
"volume": 0.0
|
||||
},
|
||||
@@ -625875,6 +625876,24 @@
|
||||
"typeNameID": 569254,
|
||||
"volume": 1.0
|
||||
},
|
||||
"56125": {
|
||||
"basePrice": 32768.0,
|
||||
"capacity": 0.0,
|
||||
"description": "<font color=\"#ff3399cc\"><b>+5% Max Velocity. Duration 24 hours.</b></font>\n<font color=\"#ff3399cc\"><b>+5 to all attibutes.</b></font>",
|
||||
"descriptionID": 569283,
|
||||
"groupID": 303,
|
||||
"iconID": 10144,
|
||||
"isDynamicType": false,
|
||||
"mass": 1.0,
|
||||
"metaGroupID": 19,
|
||||
"portionSize": 1,
|
||||
"published": true,
|
||||
"radius": 1.0,
|
||||
"typeID": 56125,
|
||||
"typeName": "Serenity Seasonal Booster 1",
|
||||
"typeNameID": 569282,
|
||||
"volume": 1.0
|
||||
},
|
||||
"5613": {
|
||||
"basePrice": 0.0,
|
||||
"capacity": 0.0,
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
[
|
||||
{
|
||||
"field_name": "client_build",
|
||||
"field_value": 1786419
|
||||
"field_value": 1788518
|
||||
},
|
||||
{
|
||||
"field_name": "dump_time",
|
||||
"field_value": 1597434126
|
||||
"field_value": 1597688381
|
||||
}
|
||||
]
|
||||
@@ -1135,7 +1135,7 @@
|
||||
"text": "reduction in ship kinetic resistances"
|
||||
},
|
||||
{
|
||||
"number": "25%",
|
||||
"number": "20%",
|
||||
"text": "bonus to ship scan resolution"
|
||||
},
|
||||
{
|
||||
@@ -6744,7 +6744,7 @@
|
||||
{
|
||||
"bonuses": [
|
||||
{
|
||||
"number": "15%",
|
||||
"number": "30%",
|
||||
"text": "bonus to Light Entropic Disintegrator optimal range"
|
||||
},
|
||||
{
|
||||
@@ -20512,8 +20512,8 @@
|
||||
"text": "bonus to Heavy Entropic Disintegrator damage"
|
||||
},
|
||||
{
|
||||
"number": "5%",
|
||||
"text": "bonus to Heavy Entropic Disintegrator tracking speed"
|
||||
"number": "7.5%",
|
||||
"text": "bonus to Heavy Entropic Disintegrator optimal range"
|
||||
}
|
||||
],
|
||||
"header": "Precursor Cruiser bonuses (per skill level):"
|
||||
|
||||
@@ -1 +1 @@
|
||||
version: v2.25.1dev1
|
||||
version: v2.25.1dev2
|
||||
|
||||
Reference in New Issue
Block a user