commit a88984564231301d089285303d34fab71cc0619e
parent 669f292fdd95d3343c6fd8ac8bb7e471b124f8c3
Author: n8n-bot <bot@novabryan.com>
Date: Tue, 6 Oct 2026 12:50:18 +0000
Auto-dump EVE code: 24.01.3579973 (20261006_3579973_code)
Diffstat:
11 files changed, 58 insertions(+), 24 deletions(-)
diff --git a/README.md b/README.md
@@ -8,6 +8,7 @@ A timeline of all version captures and synchronizations is documented here:
| Update Date | Target Version Tag | Version | Notes |
| :--- | :--- | :--- | :--- |
+| **2026-10-06** | `eve-24_01_3579973` | 24.01.3579973 | Automated unpack and sync |
| **2026-10-05** | `eve-24_01_3575015` | 24.01.3575015 | Automated unpack and sync |
| **2026-10-04** | `eve-24_01_3569502` | 24.01.3569502 | Automated unpack and sync |
| **2026-09-29** | `eve-24_01_3558187` | 24.01.3558187 | Automated unpack and sync |
diff --git a/dbuff/const.py b/dbuff/const.py
@@ -147,6 +147,7 @@ dbuffCapDayCaldariWarpSpeed = 2590
dbuffCapDayMinmatarWarpSpeed = 2591
dbuffCapDayItemTraderShieldBonus = 2593
dbuffBPDCDamageReceivedPercentage = 2600
+dbuffCHTrialSmartBombBlocker = 2692
dbuffHordeModeMJFGBlocker = 2537
dbuffHordeModeSmartBombBlocker = 2536
dbuffHordeModeVortonProjectorBlocker = 2594
diff --git a/eve/client/script/ui/inflight/itemTrader/recipeUtil.py b/eve/client/script/ui/inflight/itemTrader/recipeUtil.py
@@ -42,6 +42,7 @@ GROUP_DRONES = 'DRONES'
GROUP_SKINS = 'SKINS'
GROUP_BOOSTERS = 'BOOSTERS'
GROUP_BACKGROUNDS = 'BACKGROUNDS'
+GROUP_MUTAPLASMIDS = 'MUTAPLASMIDS'
_recipeGroupLabelPathByGroupID = {None: 'UI/Inflight/SpaceComponents/ItemTrader/GroupMisc',
GROUP_SHIP_BLUEPRINTS: 'UI/Inflight/SpaceComponents/ItemTrader/GroupShipBlueprints',
GROUP_MODULES_AMMO: 'UI/Inflight/SpaceComponents/ItemTrader/GroupModulesAndAmmoBlueprints',
@@ -50,7 +51,8 @@ _recipeGroupLabelPathByGroupID = {None: 'UI/Inflight/SpaceComponents/ItemTrader/
GROUP_DRONES: 'UI/Inflight/SpaceComponents/ItemTrader/GroupDrones',
GROUP_SKINS: 'UI/Inflight/SpaceComponents/ItemTrader/GroupSkins',
GROUP_BOOSTERS: 'UI/Inflight/SpaceComponents/ItemTrader/GroupBoosters',
- GROUP_BACKGROUNDS: 'UI/Inflight/SpaceComponents/ItemTrader/GroupBackgrounds'}
+ GROUP_BACKGROUNDS: 'UI/Inflight/SpaceComponents/ItemTrader/GroupBackgrounds',
+ GROUP_MUTAPLASMIDS: 'UI/Inflight/SpaceComponents/ItemTrader/GroupMutaplasmids'}
_recipeGroupTexturepathByGroupID = {GROUP_SHIP_BLUEPRINTS: eveicon.spaceship_command,
GROUP_MODULES_AMMO: eveicon.gunnery,
GROUP_SKINR: eveicon.skinr,
@@ -58,7 +60,8 @@ _recipeGroupTexturepathByGroupID = {GROUP_SHIP_BLUEPRINTS: eveicon.spaceship_com
GROUP_DRONES: eveicon.drones,
GROUP_SKINS: eveicon.skins,
GROUP_BOOSTERS: eveicon.heal_first_aid,
- GROUP_BACKGROUNDS: eveicon.user}
+ GROUP_BACKGROUNDS: eveicon.user,
+ GROUP_MUTAPLASMIDS: eveicon.abyssal_deadspace}
def GetRecipeGroupName(groupID):
return GetByLabel(_recipeGroupLabelPathByGroupID.get(groupID, 'UI/Inflight/SpaceComponents/ItemTrader/GroupMisc'))
diff --git a/eve/common/script/mgt/buffBarConst.py b/eve/common/script/mgt/buffBarConst.py
@@ -88,6 +88,7 @@ Slot_FactionWarfareDungeonEffectGeneric = 'factionWarfareDungeonEffectGeneric'
Slot_FactionWarfareDungeonEffectChaos = 'factionWarfareDungeonEffectChaos'
Slot_AIREpicArcEffects = 'AIREpicArcEffects'
Slot_BreacherPodDamageControl = 'BreacherPodDamageControl'
+Slot_CHTrialSmartBombBlocker = 'CHTrialSmartBombBlocker'
BUFF_SLOT_ICONS = {Slot_WarpScramblerMWD: appConst.iconModuleWarpScramblerMWD,
Slot_WarpScrambler: appConst.iconModuleWarpScrambler,
Slot_FighterTackle: appConst.iconModuleFighterTackle,
@@ -171,7 +172,8 @@ BUFF_SLOT_ICONS = {Slot_WarpScramblerMWD: appConst.iconModuleWarpScramblerMWD,
Slot_FactionWarfareDungeonEffectGeneric: appConst.iconTitanGeneratorMulti,
Slot_FactionWarfareDungeonEffectChaos: appConst.iconTitanGeneratorMulti,
Slot_AIREpicArcEffects: appConst.iconHyperNetUplink,
- Slot_BreacherPodDamageControl: appConst.iconBreacherPodDamageControl}
+ Slot_BreacherPodDamageControl: appConst.iconBreacherPodDamageControl,
+ Slot_CHTrialSmartBombBlocker: appConst.iconTriglavianCollective}
BUFF_SLOT_HINTS = {Slot_WarpScramblerMWD: 'UI/Inflight/EwarHints/WarpScrambledMWD',
Slot_WarpScrambler: 'UI/Inflight/EwarHints/WarpScrambled',
Slot_FighterTackle: 'UI/Inflight/EwarHints/FighterTackled',
@@ -255,7 +257,8 @@ BUFF_SLOT_HINTS = {Slot_WarpScramblerMWD: 'UI/Inflight/EwarHints/WarpScrambledMW
Slot_FactionWarfareDungeonEffectGeneric: 'UI/Inflight/EwarHints/FactionWarfareDungeonGeneric',
Slot_FactionWarfareDungeonEffectChaos: 'UI/Inflight/EwarHints/FactionWarfareDungeonChaos',
Slot_AIREpicArcEffects: 'UI/Inflight/EwarHints/AIREpicArcEffects',
- Slot_BreacherPodDamageControl: 'UI/Inflight/EwarHints/BreacherPodDamageControl'}
+ Slot_BreacherPodDamageControl: 'UI/Inflight/EwarHints/BreacherPodDamageControl',
+ Slot_CHTrialSmartBombBlocker: 'UI/Inflight/EwarHints/CHTrialSmartBombBlocker'}
OFFENSIVE_SLOTS = {Slot_WarpScramblerMWD,
Slot_WarpScrambler,
Slot_FighterTackle,
@@ -478,4 +481,5 @@ DBUFFS_BY_SLOT = {Slot_FocusedWarpScrambler: [dbuff.const.dbuffWarpPenalty],
dbuff.const.dbuffFW_DungeonEffectChaos19,
dbuff.const.dbuffFW_DungeonEffectChaos20],
Slot_AIREpicArcEffects: [dbuff.const.dbuffAIREpicArcHullResistances, dbuff.const.dbuffAIREpicArcCapacitorRecharge],
- Slot_BreacherPodDamageControl: [dbuff.const.dbuffBPDCDamageReceivedPercentage]}
+ Slot_BreacherPodDamageControl: [dbuff.const.dbuffBPDCDamageReceivedPercentage],
+ Slot_CHTrialSmartBombBlocker: [dbuff.const.dbuffCHTrialSmartBombBlocker]}
diff --git a/eve/common/script/sys/idCheckers.py b/eve/common/script/sys/idCheckers.py
@@ -2,7 +2,7 @@
import eve.common.lib.appConst as appConst
from eve.common.lib.appConst import ALSCActionAssemble, ALSCActionRepackage, ALSCActionSetName, ALSCActionMove, ALSCActionSetPassword, ALSCActionAdd, ALSCActionLock, ALSCActionUnlock, ALSCActionEnterPassword, ALSCActionConfigure, locationCharacterGraveyard, locationCorporationGraveyard, locationStructureGraveyard
from eveprefs import boot
-from eveuniverse.security import is_zero_sec_solar_system
+from eveuniverse.security import is_zero_sec_solar_system, is_low_sec_solar_system
from inventorycommon.const import *
minDustUser = 1000000000
@@ -333,14 +333,14 @@ def IsJunkLocation(locationID):
def GetLootChanceByAreaOfspace(locationID):
if IsWormholeSystem(locationID):
- dropChance = 0.5
- elif IsTriglavianSystem(locationID):
- dropChance = 0.6
- elif is_zero_sec_solar_system(locationID) and not IsWormholeSystem(locationID) and not IsTriglavianSystem(locationID):
- dropChance = 0.5
- else:
- dropChance = 0.5
- return dropChance
+ return 0.9
+ if IsTriglavianSystem(locationID):
+ return 0.9
+ if is_zero_sec_solar_system(locationID):
+ return 0.9
+ if is_low_sec_solar_system(locationID):
+ return 0.9
+ return 0.5
def IsDustType(typeID):
diff --git a/eveProto/generated/eve/campaign/api/commands_pb2.py b/eveProto/generated/eve/campaign/api/commands_pb2.py
@@ -5,19 +5,23 @@ from google.protobuf import reflection as _reflection
from google.protobuf import symbol_database as _symbol_database
_sym_db = _symbol_database.Default()
from eveProto.generated.eve.campaign import campaign_pb2 as eve_dot_campaign_dot_campaign__pb2
-DESCRIPTOR = _descriptor.FileDescriptor(name='eve/campaign/api/commands.proto', package='eve.campaign.api', syntax='proto3', serialized_options='Z;github.com/ccpgames/eve-proto-go/generated/eve/campaign/api', create_key=_descriptor._internal_create_key, serialized_pb='\n\x1feve/campaign/api/commands.proto\x12\x10eve.campaign.api\x1a\x1beve/campaign/campaign.proto"<\n\x0eStartCommanded\x12*\n\x08campaign\x18\x01 \x01(\x0b2\x18.eve.campaign.Identifier"W\n)EvaluateRelativeScheduleTriggersCommanded\x12*\n\x08campaign\x18\x01 \x01(\x0b2\x18.eve.campaign.Identifier"A\n\x0fExpireCommanded\x12*\n\x08campaign\x18\x01 \x01(\x0b2\x18.eve.campaign.Identifier:\x02\x18\x01"P\n\x1eTriggerNextObjectivesCommanded\x12*\n\x08campaign\x18\x01 \x01(\x0b2\x18.eve.campaign.Identifier:\x02\x18\x01"C\n\x11CompleteCommanded\x12*\n\x08campaign\x18\x01 \x01(\x0b2\x18.eve.campaign.Identifier:\x02\x18\x01B=Z;github.com/ccpgames/eve-proto-go/generated/eve/campaign/apib\x06proto3', dependencies=[eve_dot_campaign_dot_campaign__pb2.DESCRIPTOR])
+DESCRIPTOR = _descriptor.FileDescriptor(name='eve/campaign/api/commands.proto', package='eve.campaign.api', syntax='proto3', serialized_options='Z;github.com/ccpgames/eve-proto-go/generated/eve/campaign/api', create_key=_descriptor._internal_create_key, serialized_pb='\n\x1feve/campaign/api/commands.proto\x12\x10eve.campaign.api\x1a\x1beve/campaign/campaign.proto"<\n\x0eStartCommanded\x12*\n\x08campaign\x18\x01 \x01(\x0b2\x18.eve.campaign.Identifier"W\n)EvaluateRelativeScheduleTriggersCommanded\x12*\n\x08campaign\x18\x01 \x01(\x0b2\x18.eve.campaign.Identifier"y\n\x14ChangeStateCommanded\x12*\n\x08campaign\x18\x01 \x01(\x0b2\x18.eve.campaign.Identifier\x125\n\x0flifecycle_state\x18\x02 \x01(\x0b2\x1c.eve.campaign.LifecycleState"A\n\x0fExpireCommanded\x12*\n\x08campaign\x18\x01 \x01(\x0b2\x18.eve.campaign.Identifier:\x02\x18\x01"P\n\x1eTriggerNextObjectivesCommanded\x12*\n\x08campaign\x18\x01 \x01(\x0b2\x18.eve.campaign.Identifier:\x02\x18\x01"C\n\x11CompleteCommanded\x12*\n\x08campaign\x18\x01 \x01(\x0b2\x18.eve.campaign.Identifier:\x02\x18\x01B=Z;github.com/ccpgames/eve-proto-go/generated/eve/campaign/apib\x06proto3', dependencies=[eve_dot_campaign_dot_campaign__pb2.DESCRIPTOR])
_STARTCOMMANDED = _descriptor.Descriptor(name='StartCommanded', full_name='eve.campaign.api.StartCommanded', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='campaign', full_name='eve.campaign.api.StartCommanded.campaign', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=82, serialized_end=142)
_EVALUATERELATIVESCHEDULETRIGGERSCOMMANDED = _descriptor.Descriptor(name='EvaluateRelativeScheduleTriggersCommanded', full_name='eve.campaign.api.EvaluateRelativeScheduleTriggersCommanded', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='campaign', full_name='eve.campaign.api.EvaluateRelativeScheduleTriggersCommanded.campaign', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=144, serialized_end=231)
-_EXPIRECOMMANDED = _descriptor.Descriptor(name='ExpireCommanded', full_name='eve.campaign.api.ExpireCommanded', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='campaign', full_name='eve.campaign.api.ExpireCommanded.campaign', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options='\x18\x01', is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=233, serialized_end=298)
-_TRIGGERNEXTOBJECTIVESCOMMANDED = _descriptor.Descriptor(name='TriggerNextObjectivesCommanded', full_name='eve.campaign.api.TriggerNextObjectivesCommanded', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='campaign', full_name='eve.campaign.api.TriggerNextObjectivesCommanded.campaign', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options='\x18\x01', is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=300, serialized_end=380)
-_COMPLETECOMMANDED = _descriptor.Descriptor(name='CompleteCommanded', full_name='eve.campaign.api.CompleteCommanded', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='campaign', full_name='eve.campaign.api.CompleteCommanded.campaign', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options='\x18\x01', is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=382, serialized_end=449)
+_CHANGESTATECOMMANDED = _descriptor.Descriptor(name='ChangeStateCommanded', full_name='eve.campaign.api.ChangeStateCommanded', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='campaign', full_name='eve.campaign.api.ChangeStateCommanded.campaign', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='lifecycle_state', full_name='eve.campaign.api.ChangeStateCommanded.lifecycle_state', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=233, serialized_end=354)
+_EXPIRECOMMANDED = _descriptor.Descriptor(name='ExpireCommanded', full_name='eve.campaign.api.ExpireCommanded', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='campaign', full_name='eve.campaign.api.ExpireCommanded.campaign', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options='\x18\x01', is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=356, serialized_end=421)
+_TRIGGERNEXTOBJECTIVESCOMMANDED = _descriptor.Descriptor(name='TriggerNextObjectivesCommanded', full_name='eve.campaign.api.TriggerNextObjectivesCommanded', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='campaign', full_name='eve.campaign.api.TriggerNextObjectivesCommanded.campaign', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options='\x18\x01', is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=423, serialized_end=503)
+_COMPLETECOMMANDED = _descriptor.Descriptor(name='CompleteCommanded', full_name='eve.campaign.api.CompleteCommanded', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='campaign', full_name='eve.campaign.api.CompleteCommanded.campaign', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options='\x18\x01', is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=505, serialized_end=572)
_STARTCOMMANDED.fields_by_name['campaign'].message_type = eve_dot_campaign_dot_campaign__pb2._IDENTIFIER
_EVALUATERELATIVESCHEDULETRIGGERSCOMMANDED.fields_by_name['campaign'].message_type = eve_dot_campaign_dot_campaign__pb2._IDENTIFIER
+_CHANGESTATECOMMANDED.fields_by_name['campaign'].message_type = eve_dot_campaign_dot_campaign__pb2._IDENTIFIER
+_CHANGESTATECOMMANDED.fields_by_name['lifecycle_state'].message_type = eve_dot_campaign_dot_campaign__pb2._LIFECYCLESTATE
_EXPIRECOMMANDED.fields_by_name['campaign'].message_type = eve_dot_campaign_dot_campaign__pb2._IDENTIFIER
_TRIGGERNEXTOBJECTIVESCOMMANDED.fields_by_name['campaign'].message_type = eve_dot_campaign_dot_campaign__pb2._IDENTIFIER
_COMPLETECOMMANDED.fields_by_name['campaign'].message_type = eve_dot_campaign_dot_campaign__pb2._IDENTIFIER
DESCRIPTOR.message_types_by_name['StartCommanded'] = _STARTCOMMANDED
DESCRIPTOR.message_types_by_name['EvaluateRelativeScheduleTriggersCommanded'] = _EVALUATERELATIVESCHEDULETRIGGERSCOMMANDED
+DESCRIPTOR.message_types_by_name['ChangeStateCommanded'] = _CHANGESTATECOMMANDED
DESCRIPTOR.message_types_by_name['ExpireCommanded'] = _EXPIRECOMMANDED
DESCRIPTOR.message_types_by_name['TriggerNextObjectivesCommanded'] = _TRIGGERNEXTOBJECTIVESCOMMANDED
DESCRIPTOR.message_types_by_name['CompleteCommanded'] = _COMPLETECOMMANDED
@@ -28,6 +32,9 @@ _sym_db.RegisterMessage(StartCommanded)
EvaluateRelativeScheduleTriggersCommanded = _reflection.GeneratedProtocolMessageType('EvaluateRelativeScheduleTriggersCommanded', (_message.Message,), {'DESCRIPTOR': _EVALUATERELATIVESCHEDULETRIGGERSCOMMANDED,
'__module__': 'eve.campaign.api.commands_pb2'})
_sym_db.RegisterMessage(EvaluateRelativeScheduleTriggersCommanded)
+ChangeStateCommanded = _reflection.GeneratedProtocolMessageType('ChangeStateCommanded', (_message.Message,), {'DESCRIPTOR': _CHANGESTATECOMMANDED,
+ '__module__': 'eve.campaign.api.commands_pb2'})
+_sym_db.RegisterMessage(ChangeStateCommanded)
ExpireCommanded = _reflection.GeneratedProtocolMessageType('ExpireCommanded', (_message.Message,), {'DESCRIPTOR': _EXPIRECOMMANDED,
'__module__': 'eve.campaign.api.commands_pb2'})
_sym_db.RegisterMessage(ExpireCommanded)
diff --git a/eveProto/generated/eve/campaign/objective/api/commands_pb2.py b/eveProto/generated/eve/campaign/objective/api/commands_pb2.py
@@ -5,11 +5,18 @@ from google.protobuf import reflection as _reflection
from google.protobuf import symbol_database as _symbol_database
_sym_db = _symbol_database.Default()
from eveProto.generated.eve.campaign.objective import objective_pb2 as eve_dot_campaign_dot_objective_dot_objective__pb2
-DESCRIPTOR = _descriptor.FileDescriptor(name='eve/campaign/objective/api/commands.proto', package='eve.campaign.objective.api', syntax='proto3', serialized_options='ZEgithub.com/ccpgames/eve-proto-go/generated/eve/campaign/objective/api', create_key=_descriptor._internal_create_key, serialized_pb='\n)eve/campaign/objective/api/commands.proto\x12\x1aeve.campaign.objective.api\x1a&eve/campaign/objective/objective.proto"N\n\x11CompleteCommanded\x125\n\tobjective\x18\x01 \x01(\x0b2".eve.campaign.objective.Identifier:\x02\x18\x01BGZEgithub.com/ccpgames/eve-proto-go/generated/eve/campaign/objective/apib\x06proto3', dependencies=[eve_dot_campaign_dot_objective_dot_objective__pb2.DESCRIPTOR])
-_COMPLETECOMMANDED = _descriptor.Descriptor(name='CompleteCommanded', full_name='eve.campaign.objective.api.CompleteCommanded', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='objective', full_name='eve.campaign.objective.api.CompleteCommanded.objective', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options='\x18\x01', is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=113, serialized_end=191)
+DESCRIPTOR = _descriptor.FileDescriptor(name='eve/campaign/objective/api/commands.proto', package='eve.campaign.objective.api', syntax='proto3', serialized_options='ZEgithub.com/ccpgames/eve-proto-go/generated/eve/campaign/objective/api', create_key=_descriptor._internal_create_key, serialized_pb='\n)eve/campaign/objective/api/commands.proto\x12\x1aeve.campaign.objective.api\x1a&eve/campaign/objective/objective.proto"\x8e\x01\n\x14ChangeStateCommanded\x125\n\tobjective\x18\x01 \x01(\x0b2".eve.campaign.objective.Identifier\x12?\n\x0flifecycle_state\x18\x02 \x01(\x0b2&.eve.campaign.objective.LifecycleState"N\n\x11CompleteCommanded\x125\n\tobjective\x18\x01 \x01(\x0b2".eve.campaign.objective.Identifier:\x02\x18\x01BGZEgithub.com/ccpgames/eve-proto-go/generated/eve/campaign/objective/apib\x06proto3', dependencies=[eve_dot_campaign_dot_objective_dot_objective__pb2.DESCRIPTOR])
+_CHANGESTATECOMMANDED = _descriptor.Descriptor(name='ChangeStateCommanded', full_name='eve.campaign.objective.api.ChangeStateCommanded', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='objective', full_name='eve.campaign.objective.api.ChangeStateCommanded.objective', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='lifecycle_state', full_name='eve.campaign.objective.api.ChangeStateCommanded.lifecycle_state', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=114, serialized_end=256)
+_COMPLETECOMMANDED = _descriptor.Descriptor(name='CompleteCommanded', full_name='eve.campaign.objective.api.CompleteCommanded', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='objective', full_name='eve.campaign.objective.api.CompleteCommanded.objective', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options='\x18\x01', is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=258, serialized_end=336)
+_CHANGESTATECOMMANDED.fields_by_name['objective'].message_type = eve_dot_campaign_dot_objective_dot_objective__pb2._IDENTIFIER
+_CHANGESTATECOMMANDED.fields_by_name['lifecycle_state'].message_type = eve_dot_campaign_dot_objective_dot_objective__pb2._LIFECYCLESTATE
_COMPLETECOMMANDED.fields_by_name['objective'].message_type = eve_dot_campaign_dot_objective_dot_objective__pb2._IDENTIFIER
+DESCRIPTOR.message_types_by_name['ChangeStateCommanded'] = _CHANGESTATECOMMANDED
DESCRIPTOR.message_types_by_name['CompleteCommanded'] = _COMPLETECOMMANDED
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
+ChangeStateCommanded = _reflection.GeneratedProtocolMessageType('ChangeStateCommanded', (_message.Message,), {'DESCRIPTOR': _CHANGESTATECOMMANDED,
+ '__module__': 'eve.campaign.objective.api.commands_pb2'})
+_sym_db.RegisterMessage(ChangeStateCommanded)
CompleteCommanded = _reflection.GeneratedProtocolMessageType('CompleteCommanded', (_message.Message,), {'DESCRIPTOR': _COMPLETECOMMANDED,
'__module__': 'eve.campaign.objective.api.commands_pb2'})
_sym_db.RegisterMessage(CompleteCommanded)
diff --git a/eveProto/generated/eve/campaign/track/api/commands_pb2.py b/eveProto/generated/eve/campaign/track/api/commands_pb2.py
@@ -5,12 +5,19 @@ from google.protobuf import reflection as _reflection
from google.protobuf import symbol_database as _symbol_database
_sym_db = _symbol_database.Default()
from eveProto.generated.eve.campaign.track import track_pb2 as eve_dot_campaign_dot_track_dot_track__pb2
-DESCRIPTOR = _descriptor.FileDescriptor(name='eve/campaign/track/api/commands.proto', package='eve.campaign.track.api', syntax='proto3', serialized_options='ZAgithub.com/ccpgames/eve-proto-go/generated/eve/campaign/track/api', create_key=_descriptor._internal_create_key, serialized_pb='\n%eve/campaign/track/api/commands.proto\x12\x16eve.campaign.track.api\x1a\x1eeve/campaign/track/track.proto"c\n ProcessTickContributionCommanded\x12-\n\x05track\x18\x01 \x01(\x0b2\x1e.eve.campaign.track.Identifier\x12\x10\n\x08tick_key\x18\x02 \x01(\tBCZAgithub.com/ccpgames/eve-proto-go/generated/eve/campaign/track/apib\x06proto3', dependencies=[eve_dot_campaign_dot_track_dot_track__pb2.DESCRIPTOR])
+DESCRIPTOR = _descriptor.FileDescriptor(name='eve/campaign/track/api/commands.proto', package='eve.campaign.track.api', syntax='proto3', serialized_options='ZAgithub.com/ccpgames/eve-proto-go/generated/eve/campaign/track/api', create_key=_descriptor._internal_create_key, serialized_pb='\n%eve/campaign/track/api/commands.proto\x12\x16eve.campaign.track.api\x1a\x1eeve/campaign/track/track.proto"c\n ProcessTickContributionCommanded\x12-\n\x05track\x18\x01 \x01(\x0b2\x1e.eve.campaign.track.Identifier\x12\x10\n\x08tick_key\x18\x02 \x01(\t"\x82\x01\n\x14ChangeStateCommanded\x12-\n\x05track\x18\x01 \x01(\x0b2\x1e.eve.campaign.track.Identifier\x12;\n\x0flifecycle_state\x18\x02 \x01(\x0b2".eve.campaign.track.LifecycleStateBCZAgithub.com/ccpgames/eve-proto-go/generated/eve/campaign/track/apib\x06proto3', dependencies=[eve_dot_campaign_dot_track_dot_track__pb2.DESCRIPTOR])
_PROCESSTICKCONTRIBUTIONCOMMANDED = _descriptor.Descriptor(name='ProcessTickContributionCommanded', full_name='eve.campaign.track.api.ProcessTickContributionCommanded', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='track', full_name='eve.campaign.track.api.ProcessTickContributionCommanded.track', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='tick_key', full_name='eve.campaign.track.api.ProcessTickContributionCommanded.tick_key', index=1, number=2, type=9, cpp_type=9, label=1, has_default_value=False, default_value=''.decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=97, serialized_end=196)
+_CHANGESTATECOMMANDED = _descriptor.Descriptor(name='ChangeStateCommanded', full_name='eve.campaign.track.api.ChangeStateCommanded', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='track', full_name='eve.campaign.track.api.ChangeStateCommanded.track', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='lifecycle_state', full_name='eve.campaign.track.api.ChangeStateCommanded.lifecycle_state', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=199, serialized_end=329)
_PROCESSTICKCONTRIBUTIONCOMMANDED.fields_by_name['track'].message_type = eve_dot_campaign_dot_track_dot_track__pb2._IDENTIFIER
+_CHANGESTATECOMMANDED.fields_by_name['track'].message_type = eve_dot_campaign_dot_track_dot_track__pb2._IDENTIFIER
+_CHANGESTATECOMMANDED.fields_by_name['lifecycle_state'].message_type = eve_dot_campaign_dot_track_dot_track__pb2._LIFECYCLESTATE
DESCRIPTOR.message_types_by_name['ProcessTickContributionCommanded'] = _PROCESSTICKCONTRIBUTIONCOMMANDED
+DESCRIPTOR.message_types_by_name['ChangeStateCommanded'] = _CHANGESTATECOMMANDED
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
ProcessTickContributionCommanded = _reflection.GeneratedProtocolMessageType('ProcessTickContributionCommanded', (_message.Message,), {'DESCRIPTOR': _PROCESSTICKCONTRIBUTIONCOMMANDED,
'__module__': 'eve.campaign.track.api.commands_pb2'})
_sym_db.RegisterMessage(ProcessTickContributionCommanded)
+ChangeStateCommanded = _reflection.GeneratedProtocolMessageType('ChangeStateCommanded', (_message.Message,), {'DESCRIPTOR': _CHANGESTATECOMMANDED,
+ '__module__': 'eve.campaign.track.api.commands_pb2'})
+_sym_db.RegisterMessage(ChangeStateCommanded)
DESCRIPTOR._options = None
diff --git a/inventorycommon/const.py b/inventorycommon/const.py
@@ -2151,6 +2151,8 @@ typeStrategosSiegeModule = 88266
typeXarasierCapitalMicroJumpDrive = 88712
typeXarasierCapitalAncillaryShieldBooster = 88713
typeXarasierCapitalAncillaryArmorRepairer = 88718
+typeSarikusasCapitalEnergyNosferatu = 97710
+typeHormsCapitalEnergyNeutralizer = 97711
typeAmarrBattlecruiser = 33095
typeAmarrBattleship = 3339
typeAmarrCarrier = 24311
@@ -3087,7 +3089,9 @@ packagedVolumeOverridesPerType = {typePorpoise: 50000,
typeStrategosSiegeModule: 1000,
typeXarasierCapitalMicroJumpDrive: 1000,
typeXarasierCapitalAncillaryShieldBooster: 1000,
- typeXarasierCapitalAncillaryArmorRepairer: 1000}
+ typeXarasierCapitalAncillaryArmorRepairer: 1000,
+ typeSarikusasCapitalEnergyNosferatu: 1000,
+ typeHormsCapitalEnergyNeutralizer: 1000}
turretModuleGroups = [groupEnergyWeapon,
groupGasCloudHarvester,
groupGasCloudHoarder,
diff --git a/jobboard/client/features/seasons/home_page_section.py b/jobboard/client/features/seasons/home_page_section.py
@@ -44,7 +44,7 @@ class SeasonHomePageSection(Container):
if self._provider.is_hidden:
self.display = False
else:
- SeasonAdvert(parent=self, align=Align.TOLEFT, header=localization.GetByMessageID(1018631), subheader=localization.GetByMessageID(1048428))
+ SeasonAdvert(parent=self, align=Align.TOLEFT, header=localization.GetByMessageID(1056273), subheader=localization.GetByMessageID(1056274))
self.display = True
@@ -66,7 +66,7 @@ class SeasonAdvert(Container):
def _construct_underlay(self):
self._hover_frame = Frame(name='hover_frame', parent=self, texturePath='res:/UI/Texture/classes/Opportunities/advert_mask.png', cornerSize=16, color=eveColor.BLACK, opacity=0.25, pickState=PickState.OFF)
- self._bg_sprite = eveui.Sprite(name='bg_image', parent=self, align=Align.TOALL, texturePath='res:/UI/Texture/classes/Opportunities/Operation_Avalon_Air_Opportunities_Window2_700x242.jpg', textureSecondaryPath='res:/UI/Texture/classes/Opportunities/advert_mask.png', spriteEffect=trinity.TR2_SFX_MODULATE, pickState=PickState.OFF)
+ self._bg_sprite = eveui.Sprite(name='bg_image', parent=self, align=Align.TOALL, texturePath='res:/UI/Texture/classes/Opportunities/CH26_Air-Opportunities-Window_700x242.png', textureSecondaryPath='res:/UI/Texture/classes/Opportunities/advert_mask.png', spriteEffect=trinity.TR2_SFX_MODULATE, pickState=PickState.OFF)
def OnMouseEnter(self, *args):
eveui.Sound.entry_hover.play()
diff --git a/multiprocessing/pool.pyc b/multiprocessing/pool.pyc
Binary files differ.
