diff --git a/eos/effects.py b/eos/effects.py index d9f646009..fcde18756 100644 --- a/eos/effects.py +++ b/eos/effects.py @@ -42,7 +42,7 @@ class Effect4(BaseEffect): shieldBoosting Used by: - Modules from group: Shield Booster (89 of 89) + Modules from group: Shield Booster (90 of 90) """ runTime = 'late' @@ -148,7 +148,7 @@ class Effect27(BaseEffect): armorRepair Used by: - Modules from group: Armor Repair Unit (100 of 100) + Modules from group: Armor Repair Unit (101 of 101) """ runTime = 'late' @@ -203,7 +203,7 @@ class Effect39(BaseEffect): warpDisrupt Used by: - Modules named like: Warp Disruptor (28 of 28) + Modules named like: Warp Disruptor (29 of 29) """ type = 'projected', 'active' @@ -374,7 +374,7 @@ class Effect58(BaseEffect): 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 (68 of 133) + Modules from group: Propulsion Module (69 of 135) Modules from group: Reactor Control Unit (22 of 22) """ @@ -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 YC122.9 Season Booster - Max Velocity Skill: Navigation """ @@ -1150,6 +1151,7 @@ class Effect395(BaseEffect): Implants named like: grade Nomad (10 of 12) Modules named like: Low Friction Nozzle Joints (8 of 8) Implant: Genolution Core Augmentation CA-4 + Implant: Serenity YC122.9 Season Booster - Agility Skill: Evasive Maneuvering Skill: Spaceship Command """ @@ -2440,6 +2442,7 @@ class Effect856(BaseEffect): Implants named like: Eifyr and Co. 'Rogue' Warp Drive Speed WS (6 of 6) Implants named like: grade Ascendancy (10 of 12) Modules named like: Hyperspatial Velocity Optimizer (8 of 8) + Implant: Serenity YC122.9 Season Booster - Warp Speed """ type = 'passive' @@ -3737,6 +3740,7 @@ class Effect1185(BaseEffect): Used by: Implants named like: X Instinct Booster (4 of 4) Implants named like: grade Halo (15 of 18) + Implant: Serenity YC122.9 Season Booster - Signature Radius """ type = 'passive' @@ -4491,6 +4495,7 @@ class Effect1452(BaseEffect): Used by: Implants named like: grade Centurion (10 of 12) Modules named like: Particle Dispersion Projector (8 of 8) + Implant: Serenity YC122.9 Season Booster - EW Range Skill: Long Distance Jamming """ @@ -5208,7 +5213,7 @@ class Effect1720(BaseEffect): Used by: Modules from group: Capacitor Power Relay (20 of 20) - Modules from group: Shield Boost Amplifier (25 of 25) + Modules from group: Shield Boost Amplifier (23 of 23) """ type = 'passive' @@ -9223,8 +9228,8 @@ class Effect3002(BaseEffect): Used by: Modules from group: Ancillary Remote Shield Booster (4 of 4) Modules from group: Capacitor Booster (41 of 41) - Modules from group: Energy Neutralizer (54 of 54) - Modules from group: Energy Nosferatu (54 of 54) + Modules from group: Energy Neutralizer (55 of 55) + Modules from group: Energy Nosferatu (55 of 55) Modules from group: Hull Repair Unit (25 of 25) Modules from group: Remote Armor Repairer (39 of 39) Modules from group: Remote Capacitor Transmitter (35 of 35) @@ -9468,7 +9473,7 @@ class Effect3061(BaseEffect): heatDamageBonus Used by: - Modules from group: Shield Boost Amplifier (25 of 25) + Modules from group: Shield Boost Amplifier (23 of 23) """ type = 'passive' @@ -9542,7 +9547,7 @@ class Effect3174(BaseEffect): Used by: Modules from group: Stasis Grappler (7 of 7) Modules from group: Stasis Web (19 of 19) - Modules from group: Warp Scrambler (54 of 55) + Modules from group: Warp Scrambler (56 of 57) """ type = 'overheat' @@ -9558,7 +9563,7 @@ class Effect3175(BaseEffect): overloadSelfSpeedBonus Used by: - Modules from group: Propulsion Module (133 of 133) + Modules from group: Propulsion Module (135 of 135) """ type = 'overheat' @@ -9610,8 +9615,8 @@ class Effect3200(BaseEffect): overloadSelfArmorDamageAmountDurationBonus Used by: - Modules from group: Ancillary Armor Repairer (7 of 7) - Modules from group: Armor Repair Unit (100 of 100) + Modules from group: Ancillary Armor Repairer (8 of 8) + Modules from group: Armor Repair Unit (101 of 101) """ type = 'overheat' @@ -9628,8 +9633,8 @@ class Effect3201(BaseEffect): overloadSelfShieldBonusDurationBonus Used by: - Modules from group: Ancillary Shield Booster (8 of 8) - Modules from group: Shield Booster (89 of 89) + Modules from group: Ancillary Shield Booster (9 of 9) + Modules from group: Shield Booster (90 of 90) """ type = 'overheat' @@ -11206,6 +11211,7 @@ class Effect3650(BaseEffect): Used by: Implants named like: grade Centurion (10 of 12) + Implant: Serenity YC122.9 Season Booster - EW Range """ type = 'passive' @@ -11222,6 +11228,7 @@ class Effect3651(BaseEffect): Used by: Implants named like: grade Centurion (10 of 12) + Implant: Serenity YC122.9 Season Booster - EW Range """ type = 'passive' @@ -11238,6 +11245,7 @@ class Effect3652(BaseEffect): Used by: Implants named like: grade Centurion (10 of 12) + Implant: Serenity YC122.9 Season Booster - EW Range """ type = 'passive' @@ -11254,6 +11262,7 @@ class Effect3653(BaseEffect): Used by: Implants named like: grade Centurion (10 of 12) + Implant: Serenity YC122.9 Season Booster - EW Range """ type = 'passive' @@ -11354,6 +11363,7 @@ class Effect3668(BaseEffect): Used by: Implants named like: grade Harvest (10 of 12) + Implant: Serenity YC122.9 Season Booster - Mining Range """ type = 'passive' @@ -11370,6 +11380,7 @@ class Effect3669(BaseEffect): Used by: Implants named like: grade Harvest (10 of 12) + Implant: Serenity YC122.9 Season Booster - Mining Range """ type = 'passive' @@ -11386,6 +11397,7 @@ class Effect3670(BaseEffect): Used by: Implants named like: grade Harvest (10 of 12) + Implant: Serenity YC122.9 Season Booster - Mining Range """ type = 'passive' @@ -11402,6 +11414,7 @@ class Effect3671(BaseEffect): Used by: Implants named like: grade Harvest (10 of 12) + Implant: Serenity YC122.9 Season Booster - Mining Range """ type = 'passive' @@ -11418,6 +11431,7 @@ class Effect3672(BaseEffect): Used by: Implants named like: grade Harvest (12 of 12) + Implant: Serenity YC122.9 Season Booster - Mining Range """ runTime = 'early' @@ -13594,6 +13608,7 @@ class Effect4162(BaseEffect): Implants named like: Poteque 'Prospector' Astrometric Rangefinding AR (3 of 3) Implants named like: grade Virtue (10 of 12) Modules named like: Gravity Capacitor Upgrade (8 of 8) + Implant: Serenity YC122.9 Season Booster - Probe Scanning Strength Skill: Astrometric Rangefinding Skill: Astrometrics """ @@ -16691,7 +16706,7 @@ class Effect4936(BaseEffect): fueledShieldBoosting Used by: - Modules from group: Ancillary Shield Booster (8 of 8) + Modules from group: Ancillary Shield Booster (9 of 9) """ runTime = 'late' @@ -18977,7 +18992,7 @@ class Effect5275(BaseEffect): fueledArmorRepair Used by: - Modules from group: Ancillary Armor Repairer (7 of 7) + Modules from group: Ancillary Armor Repairer (8 of 8) """ runTime = 'late' @@ -23417,7 +23432,7 @@ class Effect5934(BaseEffect): warpScrambleBlockMWDWithNPCEffect Used by: - Modules named like: Warp Scrambler (27 of 27) + Modules named like: Warp Scrambler (28 of 28) """ runTime = 'early' @@ -25147,7 +25162,7 @@ class Effect6187(BaseEffect): energyNeutralizerFalloff Used by: - Modules from group: Energy Neutralizer (54 of 54) + Modules from group: Energy Neutralizer (55 of 55) """ type = 'active', 'projected' @@ -25238,7 +25253,7 @@ class Effect6197(BaseEffect): energyNosferatuFalloff Used by: - Modules from group: Energy Nosferatu (54 of 54) + Modules from group: Energy Nosferatu (55 of 55) """ runTime = 'late' @@ -29081,7 +29096,7 @@ class Effect6582(BaseEffect): moduleBonusSiegeModule Used by: - Variations of module: Siege Module I (2 of 2) + Modules named like: Siege Module (3 of 3) """ runTime = 'early' @@ -31524,7 +31539,7 @@ class Effect6730(BaseEffect): moduleBonusMicrowarpdrive Used by: - Modules from group: Propulsion Module (68 of 133) + Modules from group: Propulsion Module (69 of 135) """ runTime = 'late' @@ -31548,7 +31563,7 @@ class Effect6731(BaseEffect): moduleBonusAfterburner Used by: - Modules from group: Propulsion Module (65 of 133) + Modules from group: Propulsion Module (66 of 135) """ runTime = 'late' @@ -37181,3 +37196,39 @@ class Effect8085(BaseEffect): lambda mod: mod.item.requiresSkill('Fighters'), 'fighterAbilityMissilesExplosionRadius', container.getModifiedItemAttr('aoeCloudSizeMultiplier'), stackingPenalties=True, penaltyGroup='postMul', **kwargs) + + +class Effect8091(BaseEffect): + """ + shipBonusForceAuxiliaryG2CapBoosterStrength + + Used by: + Ship: Ninazu + """ + + type = 'passive' + + @staticmethod + def handler(fit, ship, context, projectionRange, **kwargs): + fit.modules.filteredChargeBoost( + lambda mod: mod.charge.group.name == 'Capacitor Booster Charge', + 'capacitorBonus', ship.getModifiedItemAttr('shipBonusForceAuxiliaryG2'), + skill='Gallente Carrier', **kwargs) + + +class Effect8092(BaseEffect): + """ + shipBonusForceAuxiliaryM2CapBoosterStrength + + Used by: + Ship: Lif + """ + + type = 'passive' + + @staticmethod + def handler(fit, ship, context, projectionRange, **kwargs): + fit.modules.filteredChargeBoost( + lambda mod: mod.charge.group.name == 'Capacitor Booster Charge', + 'capacitorBonus', ship.getModifiedItemAttr('shipBonusForceAuxiliaryM2'), + skill='Minmatar Carrier', **kwargs) diff --git a/staticdata/fsd_binary/dogmaeffects.json b/staticdata/fsd_binary/dogmaeffects.json index 312c9f3b5..9d46af085 100644 --- a/staticdata/fsd_binary/dogmaeffects.json +++ b/staticdata/fsd_binary/dogmaeffects.json @@ -79543,5 +79543,51 @@ "published": 0, "rangeAttributeID": 54, "rangeChance": 0 + }, + "8091": { + "disallowAutoRepeat": 0, + "effectCategory": 0, + "effectID": 8091, + "effectName": "shipBonusForceAuxiliaryG2CapBoosterStrength", + "electronicChance": 0, + "isAssistance": 0, + "isOffensive": 0, + "isWarpSafe": 0, + "modifierInfo": [ + { + "domain": "shipID", + "func": "LocationGroupModifier", + "groupID": 87, + "modifiedAttributeID": 67, + "modifyingAttributeID": 2315, + "operation": 6 + } + ], + "propulsionChance": 0, + "published": 0, + "rangeChance": 0 + }, + "8092": { + "disallowAutoRepeat": 0, + "effectCategory": 0, + "effectID": 8092, + "effectName": "shipBonusForceAuxiliaryM2CapBoosterStrength", + "electronicChance": 0, + "isAssistance": 0, + "isOffensive": 0, + "isWarpSafe": 0, + "modifierInfo": [ + { + "domain": "shipID", + "func": "LocationGroupModifier", + "groupID": 87, + "modifiedAttributeID": 67, + "modifyingAttributeID": 2318, + "operation": 6 + } + ], + "propulsionChance": 0, + "published": 0, + "rangeChance": 0 } } \ No newline at end of file diff --git a/staticdata/fsd_binary/typedogma.json b/staticdata/fsd_binary/typedogma.json index f05e15728..0a309adf6 100644 --- a/staticdata/fsd_binary/typedogma.json +++ b/staticdata/fsd_binary/typedogma.json @@ -1059154,11 +1059154,11 @@ }, { "attributeID": 268, - "value": 0.72 + "value": 0.51 }, { "attributeID": 269, - "value": 0.7125 + "value": 0.59 }, { "attributeID": 270, @@ -1059170,11 +1059170,11 @@ }, { "attributeID": 272, - "value": 0.45 + "value": 0.32 }, { "attributeID": 273, - "value": 0.57 + "value": 0.47 }, { "attributeID": 274, @@ -1059366,7 +1059366,7 @@ }, { "attributeID": 1549, - "value": 1250.0 + "value": 2150.0 }, { "attributeID": 1555, @@ -1059597,11 +1059597,11 @@ }, { "attributeID": 269, - "value": 0.55 + "value": 0.4 }, { "attributeID": 270, - "value": 0.65 + "value": 0.53 }, { "attributeID": 271, @@ -1059613,11 +1059613,11 @@ }, { "attributeID": 273, - "value": 0.5 + "value": 0.36 }, { "attributeID": 274, - "value": 0.8 + "value": 0.65 }, { "attributeID": 277, @@ -1059805,7 +1059805,7 @@ }, { "attributeID": 1549, - "value": 1250.0 + "value": 2150.0 }, { "attributeID": 1555, @@ -1060040,11 +1060040,11 @@ }, { "attributeID": 269, - "value": 0.75 + "value": 0.61 }, { "attributeID": 270, - "value": 0.45 + "value": 0.33 }, { "attributeID": 271, @@ -1060056,11 +1060056,11 @@ }, { "attributeID": 273, - "value": 0.6 + "value": 0.49 }, { "attributeID": 274, - "value": 0.7 + "value": 0.5 }, { "attributeID": 277, @@ -1060252,7 +1060252,7 @@ }, { "attributeID": 1549, - "value": 1250.0 + "value": 2150.0 }, { "attributeID": 1555, @@ -1060483,7 +1060483,7 @@ }, { "attributeID": 267, - "value": 0.36 + "value": 0.26 }, { "attributeID": 268, @@ -1060495,11 +1060495,11 @@ }, { "attributeID": 270, - "value": 0.6175 + "value": 0.51 }, { "attributeID": 271, - "value": 0.9 + "value": 0.64 }, { "attributeID": 272, @@ -1060511,7 +1060511,7 @@ }, { "attributeID": 274, - "value": 0.76 + "value": 0.63 }, { "attributeID": 277, @@ -1060699,7 +1060699,7 @@ }, { "attributeID": 1549, - "value": 1250.0 + "value": 2150.0 }, { "attributeID": 1555, @@ -2006514,6 +2006514,10 @@ { "effectID": 8029, "isDefault": 0 + }, + { + "effectID": 8092, + "isDefault": 0 } ] }, @@ -2007028,6 +2007032,10 @@ { "effectID": 8029, "isDefault": 0 + }, + { + "effectID": 8091, + "isDefault": 0 } ] }, @@ -2113956,35 +2113964,35 @@ }, { "attributeID": 267, - "value": 0.67 + "value": 0.6 }, { "attributeID": 268, - "value": 0.67 + "value": 0.6 }, { "attributeID": 269, - "value": 0.67 + "value": 0.6 }, { "attributeID": 270, - "value": 0.67 + "value": 0.6 }, { "attributeID": 271, - "value": 0.67 + "value": 0.6 }, { "attributeID": 272, - "value": 0.67 + "value": 0.6 }, { "attributeID": 273, - "value": 0.67 + "value": 0.6 }, { "attributeID": 274, - "value": 0.67 + "value": 0.6 }, { "attributeID": 277, @@ -2114216,7 +2114224,7 @@ }, { "attributeID": 1549, - "value": 1250.0 + "value": 2150.0 }, { "attributeID": 1555, @@ -2367053,7 +2367061,7 @@ }, { "attributeID": 54, - "value": 17280.0 + "value": 22464.0 }, { "attributeID": 56, @@ -2367137,7 +2367145,7 @@ }, { "attributeID": 1353, - "value": 0.6 + "value": 0.4 }, { "attributeID": 1768, @@ -2367207,7 +2367215,7 @@ }, { "attributeID": 54, - "value": 17280.0 + "value": 22464.0 }, { "attributeID": 56, @@ -2367291,7 +2367299,7 @@ }, { "attributeID": 1353, - "value": 0.6 + "value": 0.4 }, { "attributeID": 1768, @@ -2367361,7 +2367369,7 @@ }, { "attributeID": 54, - "value": 21120.0 + "value": 27456.0 }, { "attributeID": 56, @@ -2367445,7 +2367453,7 @@ }, { "attributeID": 1353, - "value": 0.6 + "value": 0.4 }, { "attributeID": 1768, @@ -2367515,7 +2367523,7 @@ }, { "attributeID": 54, - "value": 19200.0 + "value": 24960.0 }, { "attributeID": 56, @@ -2367611,7 +2367619,7 @@ }, { "attributeID": 1353, - "value": 0.6 + "value": 0.4 }, { "attributeID": 1768, @@ -2367681,7 +2367689,7 @@ }, { "attributeID": 54, - "value": 21120.0 + "value": 27456.0 }, { "attributeID": 56, @@ -2367769,7 +2367777,7 @@ }, { "attributeID": 1353, - "value": 0.6 + "value": 0.4 }, { "attributeID": 1768, @@ -2367923,7 +2367931,7 @@ }, { "attributeID": 1353, - "value": 0.65 + "value": 0.5 }, { "attributeID": 1768, @@ -2368077,7 +2368085,7 @@ }, { "attributeID": 1353, - "value": 0.65 + "value": 0.5 }, { "attributeID": 1768, @@ -2368231,7 +2368239,7 @@ }, { "attributeID": 1353, - "value": 0.65 + "value": 0.5 }, { "attributeID": 1768, @@ -2368397,7 +2368405,7 @@ }, { "attributeID": 1353, - "value": 0.65 + "value": 0.5 }, { "attributeID": 1768, @@ -2368555,7 +2368563,7 @@ }, { "attributeID": 1353, - "value": 0.65 + "value": 0.5 }, { "attributeID": 1768, @@ -2368709,7 +2368717,7 @@ }, { "attributeID": 1353, - "value": 0.82 + "value": 0.7 }, { "attributeID": 1768, @@ -2368863,7 +2368871,7 @@ }, { "attributeID": 1353, - "value": 0.82 + "value": 0.7 }, { "attributeID": 1768, @@ -2369017,7 +2369025,7 @@ }, { "attributeID": 1353, - "value": 0.82 + "value": 0.7 }, { "attributeID": 1768, @@ -2369183,7 +2369191,7 @@ }, { "attributeID": 1353, - "value": 0.82 + "value": 0.7 }, { "attributeID": 1768, @@ -2369341,7 +2369349,7 @@ }, { "attributeID": 1353, - "value": 0.82 + "value": 0.7 }, { "attributeID": 1768, @@ -2369387,7 +2369395,7 @@ "dogmaAttributes": [ { "attributeID": 114, - "value": 97.0 + "value": 116.0 }, { "attributeID": 116, @@ -2369395,7 +2369403,7 @@ }, { "attributeID": 117, - "value": 14.0 + "value": 17.0 }, { "attributeID": 118, @@ -2369453,7 +2369461,7 @@ "dogmaAttributes": [ { "attributeID": 114, - "value": 44.0 + "value": 53.0 }, { "attributeID": 116, @@ -2369461,7 +2369469,7 @@ }, { "attributeID": 117, - "value": 11.0 + "value": 13.0 }, { "attributeID": 118, @@ -2369519,7 +2369527,7 @@ "dogmaAttributes": [ { "attributeID": 114, - "value": 14.0 + "value": 17.0 }, { "attributeID": 116, @@ -2369527,7 +2369535,7 @@ }, { "attributeID": 117, - "value": 97.0 + "value": 116.0 }, { "attributeID": 118, @@ -2369585,7 +2369593,7 @@ "dogmaAttributes": [ { "attributeID": 114, - "value": 11.0 + "value": 13.0 }, { "attributeID": 116, @@ -2369593,7 +2369601,7 @@ }, { "attributeID": 117, - "value": 44.0 + "value": 53.0 }, { "attributeID": 118, @@ -2369651,7 +2369659,7 @@ "dogmaAttributes": [ { "attributeID": 114, - "value": 417.0 + "value": 500.0 }, { "attributeID": 116, @@ -2369659,7 +2369667,7 @@ }, { "attributeID": 117, - "value": 126.0 + "value": 151.0 }, { "attributeID": 118, @@ -2369717,7 +2369725,7 @@ "dogmaAttributes": [ { "attributeID": 114, - "value": 208.0 + "value": 250.0 }, { "attributeID": 116, @@ -2369725,7 +2369733,7 @@ }, { "attributeID": 117, - "value": 64.0 + "value": 77.0 }, { "attributeID": 118, @@ -2369783,7 +2369791,7 @@ "dogmaAttributes": [ { "attributeID": 114, - "value": 126.0 + "value": 151.0 }, { "attributeID": 116, @@ -2369791,7 +2369799,7 @@ }, { "attributeID": 117, - "value": 417.0 + "value": 500.0 }, { "attributeID": 118, @@ -2369849,7 +2369857,7 @@ "dogmaAttributes": [ { "attributeID": 114, - "value": 64.0 + "value": 77.0 }, { "attributeID": 116, @@ -2369857,7 +2369865,7 @@ }, { "attributeID": 117, - "value": 208.0 + "value": 250.0 }, { "attributeID": 118, @@ -2370179,7 +2370187,7 @@ "dogmaAttributes": [ { "attributeID": 114, - "value": 41.0 + "value": 49.0 }, { "attributeID": 116, @@ -2370187,7 +2370195,7 @@ }, { "attributeID": 117, - "value": 34.0 + "value": 41.0 }, { "attributeID": 118, @@ -2370453,7 +2370461,7 @@ "dogmaAttributes": [ { "attributeID": 114, - "value": 67.0 + "value": 80.0 }, { "attributeID": 116, @@ -2370461,7 +2370469,7 @@ }, { "attributeID": 117, - "value": 67.0 + "value": 80.0 }, { "attributeID": 118, @@ -2370543,7 +2370551,7 @@ "dogmaAttributes": [ { "attributeID": 114, - "value": 182.0 + "value": 218.0 }, { "attributeID": 116, @@ -2370551,7 +2370559,7 @@ }, { "attributeID": 117, - "value": 177.0 + "value": 212.0 }, { "attributeID": 118, @@ -2370633,7 +2370641,7 @@ "dogmaAttributes": [ { "attributeID": 114, - "value": 335.0 + "value": 402.0 }, { "attributeID": 116, @@ -2370641,7 +2370649,7 @@ }, { "attributeID": 117, - "value": 316.0 + "value": 379.0 }, { "attributeID": 118, @@ -2380968,7 +2380976,7 @@ }, { "attributeID": 37, - "value": 600.0 + "value": 1400.0 }, { "attributeID": 51, @@ -2381124,7 +2381132,7 @@ }, { "attributeID": 508, - "value": 350.0 + "value": 450.0 }, { "attributeID": 524, @@ -2381218,7 +2381226,7 @@ }, { "attributeID": 37, - "value": 600.0 + "value": 1400.0 }, { "attributeID": 51, @@ -2381374,7 +2381382,7 @@ }, { "attributeID": 508, - "value": 350.0 + "value": 450.0 }, { "attributeID": 524, @@ -2381416,6 +2381424,10 @@ "attributeID": 583, "value": 1.0 }, + { + "attributeID": 596, + "value": -10.625 + }, { "attributeID": 620, "value": 40000.0 @@ -2381428,6 +2381440,14 @@ "attributeID": 767, "value": -20.3 }, + { + "attributeID": 847, + "value": -10.625 + }, + { + "attributeID": 848, + "value": 13.75 + }, { "attributeID": 2491, "value": 3000.0 @@ -2381520,7 +2381540,7 @@ }, { "attributeID": 37, - "value": 600.0 + "value": 1400.0 }, { "attributeID": 51, @@ -2381676,7 +2381696,7 @@ }, { "attributeID": 508, - "value": 350.0 + "value": 450.0 }, { "attributeID": 524, @@ -2382584,15 +2382604,15 @@ }, { "attributeID": 264, - "value": 2700.0 + "value": 1000.0 }, { "attributeID": 265, - "value": 12000.0 + "value": 9500.0 }, { "attributeID": 266, - "value": 0.0 + "value": 3000.0 }, { "attributeID": 267, @@ -2382818,15 +2382838,15 @@ }, { "attributeID": 264, - "value": 2700.0 + "value": 1000.0 }, { "attributeID": 265, - "value": 12000.0 + "value": 9500.0 }, { "attributeID": 266, - "value": 0.0 + "value": 3000.0 }, { "attributeID": 267, @@ -2384204,6 +2384224,10 @@ "attributeID": 349, "value": -20.3 }, + { + "attributeID": 351, + "value": -20.3 + }, { "attributeID": 416, "value": 7000.0 @@ -2384280,6 +2384304,10 @@ "attributeID": 847, "value": -13.75 }, + { + "attributeID": 848, + "value": 13.75 + }, { "attributeID": 2511, "value": 5000.0 @@ -2387526,7 +2387554,7 @@ }, { "attributeID": 37, - "value": 500.0 + "value": 2000.0 }, { "attributeID": 51, @@ -2387726,7 +2387754,7 @@ }, { "attributeID": 665, - "value": 7000.0 + "value": 21000.0 }, { "attributeID": 1353, @@ -2387780,7 +2387808,7 @@ }, { "attributeID": 37, - "value": 500.0 + "value": 1000.0 }, { "attributeID": 51, @@ -2387932,7 +2387960,7 @@ }, { "attributeID": 508, - "value": 500.0 + "value": 300.0 }, { "attributeID": 524, @@ -2387984,7 +2388012,7 @@ }, { "attributeID": 665, - "value": 16000.0 + "value": 30000.0 }, { "attributeID": 1133, diff --git a/staticdata/fsd_lite/evetypes.json b/staticdata/fsd_lite/evetypes.json index 5a2a35a65..b54e54d61 100644 --- a/staticdata/fsd_lite/evetypes.json +++ b/staticdata/fsd_lite/evetypes.json @@ -573101,7 +573101,7 @@ "description": "This sealed containment crate holds a Calm Abyssal Filament of a random weather type that can transport you to an Abyssal Deadspace pocket.", "descriptionID": 543521, "groupID": 1194, - "iconID": 21924, + "iconID": 24510, "isDynamicType": false, "marketGroupID": 1661, "mass": 0.1, @@ -628689,6 +628689,8 @@ "56315": { "basePrice": 0.0, "capacity": 400.0, + "description": "The Angel Cartel is a vast crime empire with tentacles extending well beyond its home in the Curse region and throughout known space. The Cartel's ultimate goals are unknown but a strong emphasis on the acquisition of ancient knowledge and technology has been discerned by analysts tracking the activities of its many and varied divisions. Now the Cartel has been detected in Abyssal Deadspace, with members of the mysterious Lucifer division spreading the technology-seeking tendrils of the Angels deep into the Triglavian domains.", + "descriptionID": 570307, "graphicID": 337, "groupID": 1982, "isDynamicType": false, @@ -628706,6 +628708,8 @@ "56316": { "basePrice": 0.0, "capacity": 400.0, + "description": "The Angel Cartel is a vast crime empire with tentacles extending well beyond its home in the Curse region and throughout known space. The Cartel's ultimate goals are unknown but a strong emphasis on the acquisition of ancient knowledge and technology has been discerned by analysts tracking the activities of its many and varied divisions. Now the Cartel has been detected in Abyssal Deadspace, with members of the mysterious Lucifer division spreading the technology-seeking tendrils of the Angels deep into the Triglavian domains.", + "descriptionID": 570308, "graphicID": 336, "groupID": 1982, "isDynamicType": false, @@ -628742,6 +628746,8 @@ "56346": { "basePrice": 0.0, "capacity": 130.0, + "description": "The Angel Cartel is a vast crime empire with tentacles extending well beyond its home in the Curse region and throughout known space. The Cartel's ultimate goals are unknown but a strong emphasis on the acquisition of ancient knowledge and technology has been discerned by analysts tracking the activities of its many and varied divisions. Now the Cartel has been detected in Abyssal Deadspace, with members of the mysterious Lucifer division spreading the technology-seeking tendrils of the Angels deep into the Triglavian domains.", + "descriptionID": 570309, "graphicID": 338, "groupID": 1982, "isDynamicType": false, @@ -628759,6 +628765,8 @@ "56347": { "basePrice": 0.0, "capacity": 130.0, + "description": "The Angel Cartel is a vast crime empire with tentacles extending well beyond its home in the Curse region and throughout known space. The Cartel's ultimate goals are unknown but a strong emphasis on the acquisition of ancient knowledge and technology has been discerned by analysts tracking the activities of its many and varied divisions. Now the Cartel has been detected in Abyssal Deadspace, with members of the mysterious Lucifer division spreading the technology-seeking tendrils of the Angels deep into the Triglavian domains.", + "descriptionID": 570310, "graphicID": 338, "groupID": 1982, "isDynamicType": false, @@ -628776,6 +628784,8 @@ "56348": { "basePrice": 0.0, "capacity": 130.0, + "description": "The Angel Cartel is a vast crime empire with tentacles extending well beyond its home in the Curse region and throughout known space. The Cartel's ultimate goals are unknown but a strong emphasis on the acquisition of ancient knowledge and technology has been discerned by analysts tracking the activities of its many and varied divisions. Now the Cartel has been detected in Abyssal Deadspace, with members of the mysterious Lucifer division spreading the technology-seeking tendrils of the Angels deep into the Triglavian domains.", + "descriptionID": 570311, "graphicID": 340, "groupID": 1982, "isDynamicType": false, @@ -628793,6 +628803,8 @@ "56349": { "basePrice": 0.0, "capacity": 130.0, + "description": "The Angel Cartel is a vast crime empire with tentacles extending well beyond its home in the Curse region and throughout known space. The Cartel's ultimate goals are unknown but a strong emphasis on the acquisition of ancient knowledge and technology has been discerned by analysts tracking the activities of its many and varied divisions. Now the Cartel has been detected in Abyssal Deadspace, with members of the mysterious Lucifer division spreading the technology-seeking tendrils of the Angels deep into the Triglavian domains.", + "descriptionID": 570312, "graphicID": 343, "groupID": 1982, "isDynamicType": false, @@ -628810,6 +628822,8 @@ "56350": { "basePrice": 0.0, "capacity": 130.0, + "description": "The Angel Cartel is a vast crime empire with tentacles extending well beyond its home in the Curse region and throughout known space. The Cartel's ultimate goals are unknown but a strong emphasis on the acquisition of ancient knowledge and technology has been discerned by analysts tracking the activities of its many and varied divisions. Now the Cartel has been detected in Abyssal Deadspace, with members of the mysterious Lucifer division spreading the technology-seeking tendrils of the Angels deep into the Triglavian domains.", + "descriptionID": 570313, "graphicID": 342, "groupID": 1982, "isDynamicType": false, @@ -628827,6 +628841,8 @@ "56351": { "basePrice": 0.0, "capacity": 130.0, + "description": "The Angel Cartel is a vast crime empire with tentacles extending well beyond its home in the Curse region and throughout known space. The Cartel's ultimate goals are unknown but a strong emphasis on the acquisition of ancient knowledge and technology has been discerned by analysts tracking the activities of its many and varied divisions. Now the Cartel has been detected in Abyssal Deadspace, with members of the mysterious Lucifer division spreading the technology-seeking tendrils of the Angels deep into the Triglavian domains.", + "descriptionID": 570314, "graphicID": 306, "groupID": 1982, "isDynamicType": false, @@ -628844,6 +628860,8 @@ "56352": { "basePrice": 0.0, "capacity": 130.0, + "description": "The Angel Cartel is a vast crime empire with tentacles extending well beyond its home in the Curse region and throughout known space. The Cartel's ultimate goals are unknown but a strong emphasis on the acquisition of ancient knowledge and technology has been discerned by analysts tracking the activities of its many and varied divisions. Now the Cartel has been detected in Abyssal Deadspace, with members of the mysterious Lucifer division spreading the technology-seeking tendrils of the Angels deep into the Triglavian domains.", + "descriptionID": 570315, "graphicID": 345, "groupID": 1982, "isDynamicType": false, @@ -629047,6 +629065,24 @@ "typeNameID": 570222, "volume": 100.0 }, + "56365": { + "basePrice": 0.0, + "capacity": 0.0, + "description": "This sealed containment crate holds a Tranquil Abyssal Filament of a random weather type that can transport you to an Abyssal Deadspace pocket.", + "descriptionID": 570233, + "groupID": 1194, + "iconID": 21924, + "marketGroupID": 1661, + "mass": 0.1, + "metaGroupID": 19, + "portionSize": 1, + "published": true, + "radius": 1.0, + "typeID": 56365, + "typeName": "Tranquil Abyssal Filaments Crate", + "typeNameID": 570232, + "volume": 1.0 + }, "564": { "basePrice": 12000.0, "capacity": 0.2, diff --git a/staticdata/phobos/metadata.json b/staticdata/phobos/metadata.json index 085b949e0..8c2d3f69c 100644 --- a/staticdata/phobos/metadata.json +++ b/staticdata/phobos/metadata.json @@ -1,10 +1,10 @@ [ { "field_name": "client_build", - "field_value": 1805757 + "field_value": 1806850 }, { "field_name": "dump_time", - "field_value": 1600240135 + "field_value": 1600282684 } ] \ No newline at end of file diff --git a/staticdata/phobos/traits.json b/staticdata/phobos/traits.json index edb9de570..f7eb9cff3 100644 --- a/staticdata/phobos/traits.json +++ b/staticdata/phobos/traits.json @@ -9688,7 +9688,7 @@ }, { "number": "7.5%", - "text": "bonus to Armor Repairer amount" + "text": "bonus to Armor Repairer and Capacitor Booster amount" }, { "number": "1%", @@ -9742,7 +9742,7 @@ }, { "number": "7.5%", - "text": "bonus to Shield Booster amount" + "text": "bonus to Shield Booster and Capacitor Booster amount" }, { "number": "1%", diff --git a/version.yml b/version.yml index 9ad5e07ce..7e0e3e77e 100644 --- a/version.yml +++ b/version.yml @@ -1 +1 @@ -version: v2.28.2 +version: v2.28.3dev1