commit aca23d2a68e37a85f6306368639d2c31bfb17775 parent a0288316fc9d78e4bef59ec17cfa1ca1052182d5 Author: n8n-bot <bot@novabryan.com> Date: Sun, 4 Oct 2026 12:50:52 +0000 Auto-dump EVE code: 24.01.3569502 (20261004_3569502_code) Diffstat:
31 files changed, 7502 insertions(+), 87 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-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 | | **2026-09-28** | `eve-24_01_3552227` | 24.01.3552227 | Automated unpack and sync | | **2026-09-24** | `eve-24_01_3542233` | 24.01.3542233 | Automated unpack and sync | diff --git a/carbon/common/script/sys/loadService.py b/carbon/common/script/sys/loadService.py @@ -1,4 +1,5 @@ #Embedded file name: C:\BuildAgent\work\20d73f1b24eed06e\eve\release\V24.01\carbon\common\script\sys\loadService.py +from __future__ import absolute_import import itertools import math import random diff --git a/carbon/common/script/sys/serviceManager.py b/carbon/common/script/sys/serviceManager.py @@ -685,8 +685,8 @@ class ServiceManager(logUtil.LogMixin): return self.ScatterEventWithoutTheStars(eventid, args, keywords) def ScatterEventWithoutTheStars(self, eventid, args, keywords = None): - if keywords is None: - keywords = {} + keywords = dict(keywords) if keywords else {} + tracingEnabled = keywords.pop(bluepy.STACKLESS_TRACING_ENABLED_KEY, False) if not eventid.startswith('On'): self.LogError('ScatterEvent called with event ', eventid, ". All events sent via ScatterEvent should start with 'On'.") self.LogError("Not only is the programmer responsible for this a 10z3r, but he wears his mother's underwear as well") @@ -705,12 +705,14 @@ class ServiceManager(logUtil.LogMixin): if shouldLogMethodCalls: self.LogMethodCall('Calling ', logname) srvGuid = getattr(srv, '__guid__', logname) - uthread.worker(prefix + srvGuid, self.MollycoddledUthread, srvGuid, eventid, getattr(srv, eventid), args, keywords) + uthread.worker(prefix + srvGuid, self.MollycoddledUthread, srvGuid, eventid, getattr(srv, eventid), args, keywords, stackless_tracing_enabled=tracingEnabled) elif shouldLogMethodCalls: self.LogMethodCall('Skipping ', logname, ' (service not running)') except Exception: log.LogException() + observerKeywords = dict(keywords) + observerKeywords[bluepy.STACKLESS_TRACING_ENABLED_KEY] = tracingEnabled notifiedToRemove = [] for weakObj in self.notifyObs[eventid]: try: @@ -722,7 +724,7 @@ class ServiceManager(logUtil.LogMixin): if shouldLogMethodCalls: logname = prefix + str(obj) self.LogMethodCall('Calling ', logname) - uthread.workerWithoutTheStars('', func, args, keywords) + uthread.workerWithoutTheStars('', func, args, observerKeywords) except Exception: log.LogException() diff --git a/carbon/common/script/sys/test/__init__.py b/carbon/common/script/sys/test/__init__.py @@ -0,0 +1,2 @@ +#Embedded file name: C:\BuildAgent\work\20d73f1b24eed06e\eve\release\V24.01\carbon\common\script\sys\test\__init__.py +pass diff --git a/carbon/common/script/sys/test/test_scatterEventTracing.py b/carbon/common/script/sys/test/test_scatterEventTracing.py @@ -0,0 +1,113 @@ +#Embedded file name: C:\BuildAgent\work\20d73f1b24eed06e\eve\release\V24.01\carbon\common\script\sys\test\test_scatterEventTracing.py +import mock +import uthread +import bluepy +from carbon.common.script.sys.serviceConst import SERVICE_RUNNING +from testsuites.testcases import ROLE_SERVER, ServerTestCase, init_prefs +init_prefs(ROLE_SERVER) +from carbon.common.script.sys import serviceManager +from carbon.common.script.sys.service import Service +EVENT = 'OnScatterEventTracingCoverage' +FLAG = bluepy.STACKLESS_TRACING_ENABLED_KEY +_SERVICE_MANAGER = None + +def _service_manager(): + global _SERVICE_MANAGER + if _SERVICE_MANAGER is None: + _SERVICE_MANAGER = serviceManager.ServiceManager() + return _SERVICE_MANAGER + + +class _Listener(object): + + def __init__(self): + self.calls = [] + + def OnScatterEventTracingCoverage(self, *args, **keywords): + self.calls.append((args, keywords)) + + +class _Observer(_Listener): + __notifyevents__ = [EVENT] + + +class _ServiceListener(Service, _Listener): + __guid__ = 'svc.scatterEventTracingCoverage' + __notifyevents__ = [EVENT] + + def __init__(self): + Service.__init__(self) + _Listener.__init__(self) + self.state = SERVICE_RUNNING + + +class _ScatterTestCase(ServerTestCase): + listener_class = None + + def setUp(self): + super(_ScatterTestCase, self).setUp() + self.serviceManager = _service_manager() + self.listener = self.listener_class() + self.serviceManager.RegisterNotify(self.listener) + + def tearDown(self): + self.serviceManager.UnregisterNotify(self.listener) + super(_ScatterTestCase, self).tearDown() + + +class ObserverPathTests(_ScatterTestCase): + listener_class = _Observer + + def _worker_keywords(self, keywords = None): + with mock.patch.object(uthread, 'workerWithoutTheStars') as worker: + self.serviceManager.ScatterEventWithoutTheStars(EVENT, (), keywords) + self.assertEqual(1, worker.call_count, 'the observer should have been dispatched once') + return worker.call_args[0][3] + + def test_declines_tracing_by_default(self): + self.assertFalse(self._worker_keywords()[FLAG]) + + def test_traces_when_the_sender_opts_in(self): + self.assertTrue(self._worker_keywords({FLAG: True})[FLAG]) + + def test_the_caller_keywords_are_not_mutated(self): + keywords = {'alpha': 1} + passed = self._worker_keywords(keywords) + self.assertEqual({'alpha': 1}, keywords, "the caller's dict was modified in place") + self.assertEqual(1, passed['alpha'], "the listener's own keywords were dropped") + + def test_the_listener_never_sees_the_flag(self): + with mock.patch.object(bluepy, 'TaskletExt') as taskletExt: + self.serviceManager.ScatterEventWithoutTheStars(EVENT, (7,), {'alpha': 1}) + self.assertFalse(taskletExt.call_args[1]['stackless_tracing_enabled']) + applied = taskletExt.return_value.call_args + self.assertEqual((7,), applied[0]) + self.assertEqual({'alpha': 1}, applied[1]) + + +class ServicePathTests(_ScatterTestCase): + listener_class = _ServiceListener + + def _worker_call(self, keywords = None): + with mock.patch.object(uthread, 'worker') as worker: + self.serviceManager.ScatterEventWithoutTheStars(EVENT, (), keywords) + self.assertEqual(1, worker.call_count, 'the service should have been dispatched once') + return worker.call_args + + def test_declines_tracing_by_default(self): + self.assertFalse(self._worker_call()[1]['stackless_tracing_enabled']) + + def test_traces_when_the_sender_opts_in(self): + self.assertTrue(self._worker_call({FLAG: True})[1]['stackless_tracing_enabled']) + + def test_the_flag_stays_out_of_the_listener_keywords(self): + listenerKeywords = self._worker_call({'alpha': 1})[0][6] + self.assertNotIn(FLAG, listenerKeywords) + self.assertEqual({'alpha': 1}, listenerKeywords) + + def test_the_listener_never_sees_the_flag(self): + with mock.patch.object(bluepy, 'TaskletExt') as taskletExt: + self.serviceManager.ScatterEventWithoutTheStars(EVENT, (7,), {'alpha': 1}) + self.assertFalse(taskletExt.call_args[1]['stackless_tracing_enabled']) + self.serviceManager.MollycoddledUthread(*taskletExt.return_value.call_args[0]) + self.assertEqual([((7,), {'alpha': 1})], self.listener.calls) diff --git a/dynamicresources/client/ess/bracket/panel.py b/dynamicresources/client/ess/bracket/panel.py @@ -152,6 +152,7 @@ class BracketPanel(object): self.collapse(lock=should_lock) self._is_collapsed = True self.is_locked = False + self._update_interaction_point_in_frame() eveui.wait_for_next_frame() def request_collapse(self, priority = 0, lock = False): @@ -203,6 +204,9 @@ class BracketPanel(object): self._focus_state_token.clear() self._focus_state_token = None + def _update_interaction_point_in_frame(self): + pass + def _on_global_mouse_down(self, target, *args, **kwargs): if target is None: return True diff --git a/dynamicresources/client/ess/bracket/tether.py b/dynamicresources/client/ess/bracket/tether.py @@ -174,5 +174,11 @@ class BracketTether(Container): self._close_interaction_outer_segments.color = rgb_color self._head_inner.color = rgb_color + def show_interaction_point(self): + self._interaction_point.Show() + + def hide_interaction_point(self): + self._interaction_point.Hide() + from dynamicresources.client.ess.bracket.debug import __reload_update__ diff --git a/eveProto/generated/eve/legal/__init__.py b/eveProto/generated/eve/legal/__init__.py @@ -0,0 +1,2 @@ +#Embedded file name: C:\BuildAgent\work\20d73f1b24eed06e\eve\release\V24.01\packages\eveProto\generated\eve\legal\__init__.py +pass diff --git a/eveProto/generated/eve/legal/agreement/__init__.py b/eveProto/generated/eve/legal/agreement/__init__.py @@ -0,0 +1,2 @@ +#Embedded file name: C:\BuildAgent\work\20d73f1b24eed06e\eve\release\V24.01\packages\eveProto\generated\eve\legal\agreement\__init__.py +pass diff --git a/eveProto/generated/eve/legal/agreement/agreement_pb2.py b/eveProto/generated/eve/legal/agreement/agreement_pb2.py @@ -0,0 +1,40 @@ +#Embedded file name: C:\BuildAgent\work\20d73f1b24eed06e\eve\release\V24.01\packages\eveProto\generated\eve\legal\agreement\agreement_pb2.py +from google.protobuf.internal import enum_type_wrapper +from google.protobuf import descriptor as _descriptor +from google.protobuf import message as _message +from google.protobuf import reflection as _reflection +from google.protobuf import symbol_database as _symbol_database +_sym_db = _symbol_database.Default() +DESCRIPTOR = _descriptor.FileDescriptor(name='eve/legal/agreement/agreement.proto', package='eve.legal.agreement', syntax='proto3', serialized_options='Z>github.com/ccpgames/eve-proto-go/generated/eve/legal/agreement', create_key=_descriptor._internal_create_key, serialized_pb='\n#eve/legal/agreement/agreement.proto\x12\x13eve.legal.agreement""\n\x12DocumentIdentifier\x12\x0c\n\x04hash\x18\x01 \x01(\t"\x8d\x01\n\nIdentifier\x129\n\x0eagreement_type\x18\x01 \x01(\x0e2!.eve.legal.agreement.DocumentType\x12D\n\x13document_identifier\x18\x02 \x01(\x0b2\'.eve.legal.agreement.DocumentIdentifier"(\n\nAttributes\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0c\n\x04body\x18\x02 \x01(\t"i\n\x05Entry\x12+\n\x02id\x18\x01 \x01(\x0b2\x1f.eve.legal.agreement.Identifier\x123\n\nattributes\x18\x02 \x01(\x0b2\x1f.eve.legal.agreement.Attributes*E\n\x0cDocumentType\x12\x1d\n\x19DOCUMENT_TYPE_UNSPECIFIED\x10\x00\x12\x16\n\x12DOCUMENT_TYPE_EULA\x10\x01B@Z>github.com/ccpgames/eve-proto-go/generated/eve/legal/agreementb\x06proto3') +_DOCUMENTTYPE = _descriptor.EnumDescriptor(name='DocumentType', full_name='eve.legal.agreement.DocumentType', filename=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key, values=[_descriptor.EnumValueDescriptor(name='DOCUMENT_TYPE_UNSPECIFIED', index=0, number=0, serialized_options=None, type=None, create_key=_descriptor._internal_create_key), _descriptor.EnumValueDescriptor(name='DOCUMENT_TYPE_EULA', index=1, number=1, serialized_options=None, type=None, create_key=_descriptor._internal_create_key)], containing_type=None, serialized_options=None, serialized_start=389, serialized_end=458) +_sym_db.RegisterEnumDescriptor(_DOCUMENTTYPE) +DocumentType = enum_type_wrapper.EnumTypeWrapper(_DOCUMENTTYPE) +DOCUMENT_TYPE_UNSPECIFIED = 0 +DOCUMENT_TYPE_EULA = 1 +_DOCUMENTIDENTIFIER = _descriptor.Descriptor(name='DocumentIdentifier', full_name='eve.legal.agreement.DocumentIdentifier', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='hash', full_name='eve.legal.agreement.DocumentIdentifier.hash', index=0, number=1, 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=60, serialized_end=94) +_IDENTIFIER = _descriptor.Descriptor(name='Identifier', full_name='eve.legal.agreement.Identifier', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='agreement_type', full_name='eve.legal.agreement.Identifier.agreement_type', index=0, number=1, type=14, cpp_type=8, label=1, has_default_value=False, default_value=0, 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='document_identifier', full_name='eve.legal.agreement.Identifier.document_identifier', 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=97, serialized_end=238) +_ATTRIBUTES = _descriptor.Descriptor(name='Attributes', full_name='eve.legal.agreement.Attributes', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='name', full_name='eve.legal.agreement.Attributes.name', index=0, number=1, 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), _descriptor.FieldDescriptor(name='body', full_name='eve.legal.agreement.Attributes.body', 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=240, serialized_end=280) +_ENTRY = _descriptor.Descriptor(name='Entry', full_name='eve.legal.agreement.Entry', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='id', full_name='eve.legal.agreement.Entry.id', 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='attributes', full_name='eve.legal.agreement.Entry.attributes', 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=282, serialized_end=387) +_IDENTIFIER.fields_by_name['agreement_type'].enum_type = _DOCUMENTTYPE +_IDENTIFIER.fields_by_name['document_identifier'].message_type = _DOCUMENTIDENTIFIER +_ENTRY.fields_by_name['id'].message_type = _IDENTIFIER +_ENTRY.fields_by_name['attributes'].message_type = _ATTRIBUTES +DESCRIPTOR.message_types_by_name['DocumentIdentifier'] = _DOCUMENTIDENTIFIER +DESCRIPTOR.message_types_by_name['Identifier'] = _IDENTIFIER +DESCRIPTOR.message_types_by_name['Attributes'] = _ATTRIBUTES +DESCRIPTOR.message_types_by_name['Entry'] = _ENTRY +DESCRIPTOR.enum_types_by_name['DocumentType'] = _DOCUMENTTYPE +_sym_db.RegisterFileDescriptor(DESCRIPTOR) +DocumentIdentifier = _reflection.GeneratedProtocolMessageType('DocumentIdentifier', (_message.Message,), {'DESCRIPTOR': _DOCUMENTIDENTIFIER, + '__module__': 'eve.legal.agreement.agreement_pb2'}) +_sym_db.RegisterMessage(DocumentIdentifier) +Identifier = _reflection.GeneratedProtocolMessageType('Identifier', (_message.Message,), {'DESCRIPTOR': _IDENTIFIER, + '__module__': 'eve.legal.agreement.agreement_pb2'}) +_sym_db.RegisterMessage(Identifier) +Attributes = _reflection.GeneratedProtocolMessageType('Attributes', (_message.Message,), {'DESCRIPTOR': _ATTRIBUTES, + '__module__': 'eve.legal.agreement.agreement_pb2'}) +_sym_db.RegisterMessage(Attributes) +Entry = _reflection.GeneratedProtocolMessageType('Entry', (_message.Message,), {'DESCRIPTOR': _ENTRY, + '__module__': 'eve.legal.agreement.agreement_pb2'}) +_sym_db.RegisterMessage(Entry) +DESCRIPTOR._options = None diff --git a/eveProto/generated/eve/legal/agreement/api/__init__.py b/eveProto/generated/eve/legal/agreement/api/__init__.py @@ -0,0 +1,2 @@ +#Embedded file name: C:\BuildAgent\work\20d73f1b24eed06e\eve\release\V24.01\packages\eveProto\generated\eve\legal\agreement\api\__init__.py +pass diff --git a/eveProto/generated/eve/legal/agreement/api/requests_pb2.py b/eveProto/generated/eve/legal/agreement/api/requests_pb2.py @@ -0,0 +1,22 @@ +#Embedded file name: C:\BuildAgent\work\20d73f1b24eed06e\eve\release\V24.01\packages\eveProto\generated\eve\legal\agreement\api\requests_pb2.py +from google.protobuf import descriptor as _descriptor +from google.protobuf import message as _message +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.legal.agreement import agreement_pb2 as eve_dot_legal_dot_agreement_dot_agreement__pb2 +DESCRIPTOR = _descriptor.FileDescriptor(name='eve/legal/agreement/api/requests.proto', package='eve.legal.agreement.api', syntax='proto3', serialized_options='ZBgithub.com/ccpgames/eve-proto-go/generated/eve/legal/agreement/api', create_key=_descriptor._internal_create_key, serialized_pb='\n&eve/legal/agreement/api/requests.proto\x12\x17eve.legal.agreement.api\x1a#eve/legal/agreement/agreement.proto"M\n\x10GetLatestRequest\x129\n\x0eagreement_type\x18\x01 \x01(\x0e2!.eve.legal.agreement.DocumentType"B\n\x11GetLatestResponse\x12-\n\tagreement\x18\x01 \x01(\x0b2\x1a.eve.legal.agreement.EntryBDZBgithub.com/ccpgames/eve-proto-go/generated/eve/legal/agreement/apib\x06proto3', dependencies=[eve_dot_legal_dot_agreement_dot_agreement__pb2.DESCRIPTOR]) +_GETLATESTREQUEST = _descriptor.Descriptor(name='GetLatestRequest', full_name='eve.legal.agreement.api.GetLatestRequest', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='agreement_type', full_name='eve.legal.agreement.api.GetLatestRequest.agreement_type', index=0, number=1, type=14, cpp_type=8, label=1, has_default_value=False, default_value=0, 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=104, serialized_end=181) +_GETLATESTRESPONSE = _descriptor.Descriptor(name='GetLatestResponse', full_name='eve.legal.agreement.api.GetLatestResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='agreement', full_name='eve.legal.agreement.api.GetLatestResponse.agreement', 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=183, serialized_end=249) +_GETLATESTREQUEST.fields_by_name['agreement_type'].enum_type = eve_dot_legal_dot_agreement_dot_agreement__pb2._DOCUMENTTYPE +_GETLATESTRESPONSE.fields_by_name['agreement'].message_type = eve_dot_legal_dot_agreement_dot_agreement__pb2._ENTRY +DESCRIPTOR.message_types_by_name['GetLatestRequest'] = _GETLATESTREQUEST +DESCRIPTOR.message_types_by_name['GetLatestResponse'] = _GETLATESTRESPONSE +_sym_db.RegisterFileDescriptor(DESCRIPTOR) +GetLatestRequest = _reflection.GeneratedProtocolMessageType('GetLatestRequest', (_message.Message,), {'DESCRIPTOR': _GETLATESTREQUEST, + '__module__': 'eve.legal.agreement.api.requests_pb2'}) +_sym_db.RegisterMessage(GetLatestRequest) +GetLatestResponse = _reflection.GeneratedProtocolMessageType('GetLatestResponse', (_message.Message,), {'DESCRIPTOR': _GETLATESTRESPONSE, + '__module__': 'eve.legal.agreement.api.requests_pb2'}) +_sym_db.RegisterMessage(GetLatestResponse) +DESCRIPTOR._options = None diff --git a/eveProto/generated/eve/tournament/arena/arena_pb2.py b/eveProto/generated/eve/tournament/arena/arena_pb2.py @@ -10,7 +10,7 @@ from eveProto.generated.eve.tournament.arena.layout import layout_pb2 as eve_dot from eveProto.generated.eve.tournament.ruleset import ruleset_pb2 as eve_dot_tournament_dot_ruleset_dot_ruleset__pb2 from eveProto.generated.eve.tournament import tournament_pb2 as eve_dot_tournament_dot_tournament__pb2 from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2 -DESCRIPTOR = _descriptor.FileDescriptor(name='eve/tournament/arena/arena.proto', package='eve.tournament.arena', syntax='proto3', serialized_options='Z?github.com/ccpgames/eve-proto-go/generated/eve/tournament/arena', create_key=_descriptor._internal_create_key, serialized_pb='\n eve/tournament/arena/arena.proto\x12\x14eve.tournament.arena\x1a\x1deve/character/character.proto\x1a!eve/solarsystem/solarsystem.proto\x1a(eve/tournament/arena/layout/layout.proto\x1a$eve/tournament/ruleset/ruleset.proto\x1a\x1feve/tournament/tournament.proto\x1a\x1fgoogle/protobuf/timestamp.proto"\x1a\n\nIdentifier\x12\x0c\n\x04uuid\x18\x01 \x01(\x0c"+\n\x08Position\x12\t\n\x01x\x18\x01 \x01(\x12\x12\t\n\x01y\x18\x02 \x01(\x12\x12\t\n\x01z\x18\x03 \x01(\x12"\xa7\x03\n\nAttributes\x12\x0c\n\x04name\x18\x01 \x01(\t\x121\n\x0csolar_system\x18\x02 \x01(\x0b2\x1b.eve.solarsystem.Identifier\x12\x0e\n\x06radius\x18\x03 \x01(\x04\x12\x13\n\tno_nebula\x18\x04 \x01(\x08H\x00\x12\x15\n\x0bnebula_code\x18\x05 \x01(\tH\x00\x12.\n\ntournament\x18\x06 \x01(\x0b2\x1a.eve.tournament.Identifier\x127\n\x06layout\x18\x07 \x01(\x0b2\'.eve.tournament.arena.layout.Identifier\x12\x16\n\x0elayout_version\x18\x08 \x01(\x04\x12*\n\x06expiry\x18\t \x01(\x0b2\x1a.google.protobuf.Timestamp\x120\n\x08position\x18\n \x01(\x0b2\x1e.eve.tournament.arena.Position\x123\n\x07ruleset\x18\x0b \x01(\x0b2".eve.tournament.ruleset.IdentifierB\x08\n\x06nebula"H\n\x08Settings\x12<\n\x19boundary_violation_killer\x18\x01 \x01(\x0b2\x19.eve.character.IdentifierBAZ?github.com/ccpgames/eve-proto-go/generated/eve/tournament/arenab\x06proto3', dependencies=[eve_dot_character_dot_character__pb2.DESCRIPTOR, +DESCRIPTOR = _descriptor.FileDescriptor(name='eve/tournament/arena/arena.proto', package='eve.tournament.arena', syntax='proto3', serialized_options='Z?github.com/ccpgames/eve-proto-go/generated/eve/tournament/arena', create_key=_descriptor._internal_create_key, serialized_pb='\n eve/tournament/arena/arena.proto\x12\x14eve.tournament.arena\x1a\x1deve/character/character.proto\x1a!eve/solarsystem/solarsystem.proto\x1a(eve/tournament/arena/layout/layout.proto\x1a$eve/tournament/ruleset/ruleset.proto\x1a\x1feve/tournament/tournament.proto\x1a\x1fgoogle/protobuf/timestamp.proto"\x1a\n\nIdentifier\x12\x0c\n\x04uuid\x18\x01 \x01(\x0c"+\n\x08Position\x12\t\n\x01x\x18\x01 \x01(\x12\x12\t\n\x01y\x18\x02 \x01(\x12\x12\t\n\x01z\x18\x03 \x01(\x12"\xab\x03\n\nAttributes\x12\x0c\n\x04name\x18\x01 \x01(\t\x121\n\x0csolar_system\x18\x02 \x01(\x0b2\x1b.eve.solarsystem.Identifier\x12\x0e\n\x06radius\x18\x03 \x01(\x04\x12.\n\ntournament\x18\x06 \x01(\x0b2\x1a.eve.tournament.Identifier\x127\n\x06layout\x18\x07 \x01(\x0b2\'.eve.tournament.arena.layout.Identifier\x12\x16\n\x0elayout_version\x18\x08 \x01(\x04\x12*\n\x06expiry\x18\t \x01(\x0b2\x1a.google.protobuf.Timestamp\x120\n\x08position\x18\n \x01(\x0b2\x1e.eve.tournament.arena.Position\x123\n\x07ruleset\x18\x0b \x01(\x0b2".eve.tournament.ruleset.Identifier\x12\x14\n\x0cnebula_codes\x18\x0c \x03(\tJ\x04\x08\x04\x10\x05J\x04\x08\x05\x10\x06R\tno_nebulaR\x0bnebula_code"H\n\x08Settings\x12<\n\x19boundary_violation_killer\x18\x01 \x01(\x0b2\x19.eve.character.IdentifierBAZ?github.com/ccpgames/eve-proto-go/generated/eve/tournament/arenab\x06proto3', dependencies=[eve_dot_character_dot_character__pb2.DESCRIPTOR, eve_dot_solarsystem_dot_solarsystem__pb2.DESCRIPTOR, eve_dot_tournament_dot_arena_dot_layout_dot_layout__pb2.DESCRIPTOR, eve_dot_tournament_dot_ruleset_dot_ruleset__pb2.DESCRIPTOR, @@ -21,25 +21,20 @@ _POSITION = _descriptor.Descriptor(name='Position', full_name='eve.tournament.ar _ATTRIBUTES = _descriptor.Descriptor(name='Attributes', full_name='eve.tournament.arena.Attributes', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='name', full_name='eve.tournament.arena.Attributes.name', index=0, number=1, 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), _descriptor.FieldDescriptor(name='solar_system', full_name='eve.tournament.arena.Attributes.solar_system', 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), _descriptor.FieldDescriptor(name='radius', full_name='eve.tournament.arena.Attributes.radius', index=2, number=3, type=4, cpp_type=4, label=1, has_default_value=False, default_value=0, 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='no_nebula', full_name='eve.tournament.arena.Attributes.no_nebula', index=3, number=4, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, 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='nebula_code', full_name='eve.tournament.arena.Attributes.nebula_code', index=4, number=5, 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), - _descriptor.FieldDescriptor(name='tournament', full_name='eve.tournament.arena.Attributes.tournament', index=5, number=6, 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='layout', full_name='eve.tournament.arena.Attributes.layout', index=6, number=7, 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='layout_version', full_name='eve.tournament.arena.Attributes.layout_version', index=7, number=8, type=4, cpp_type=4, label=1, has_default_value=False, default_value=0, 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='expiry', full_name='eve.tournament.arena.Attributes.expiry', index=8, number=9, 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='position', full_name='eve.tournament.arena.Attributes.position', index=9, number=10, 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='ruleset', full_name='eve.tournament.arena.Attributes.ruleset', index=10, number=11, 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=[_descriptor.OneofDescriptor(name='nebula', full_name='eve.tournament.arena.Attributes.nebula', index=0, containing_type=None, create_key=_descriptor._internal_create_key, fields=[])], serialized_start=344, serialized_end=767) -_SETTINGS = _descriptor.Descriptor(name='Settings', full_name='eve.tournament.arena.Settings', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='boundary_violation_killer', full_name='eve.tournament.arena.Settings.boundary_violation_killer', 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=769, serialized_end=841) + _descriptor.FieldDescriptor(name='tournament', full_name='eve.tournament.arena.Attributes.tournament', index=3, number=6, 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='layout', full_name='eve.tournament.arena.Attributes.layout', index=4, number=7, 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='layout_version', full_name='eve.tournament.arena.Attributes.layout_version', index=5, number=8, type=4, cpp_type=4, label=1, has_default_value=False, default_value=0, 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='expiry', full_name='eve.tournament.arena.Attributes.expiry', index=6, number=9, 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='position', full_name='eve.tournament.arena.Attributes.position', index=7, number=10, 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='ruleset', full_name='eve.tournament.arena.Attributes.ruleset', index=8, number=11, 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='nebula_codes', full_name='eve.tournament.arena.Attributes.nebula_codes', index=9, number=12, type=9, cpp_type=9, label=3, has_default_value=False, default_value=[], 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=344, serialized_end=771) +_SETTINGS = _descriptor.Descriptor(name='Settings', full_name='eve.tournament.arena.Settings', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='boundary_violation_killer', full_name='eve.tournament.arena.Settings.boundary_violation_killer', 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=773, serialized_end=845) _ATTRIBUTES.fields_by_name['solar_system'].message_type = eve_dot_solarsystem_dot_solarsystem__pb2._IDENTIFIER _ATTRIBUTES.fields_by_name['tournament'].message_type = eve_dot_tournament_dot_tournament__pb2._IDENTIFIER _ATTRIBUTES.fields_by_name['layout'].message_type = eve_dot_tournament_dot_arena_dot_layout_dot_layout__pb2._IDENTIFIER _ATTRIBUTES.fields_by_name['expiry'].message_type = google_dot_protobuf_dot_timestamp__pb2._TIMESTAMP _ATTRIBUTES.fields_by_name['position'].message_type = _POSITION _ATTRIBUTES.fields_by_name['ruleset'].message_type = eve_dot_tournament_dot_ruleset_dot_ruleset__pb2._IDENTIFIER -_ATTRIBUTES.oneofs_by_name['nebula'].fields.append(_ATTRIBUTES.fields_by_name['no_nebula']) -_ATTRIBUTES.fields_by_name['no_nebula'].containing_oneof = _ATTRIBUTES.oneofs_by_name['nebula'] -_ATTRIBUTES.oneofs_by_name['nebula'].fields.append(_ATTRIBUTES.fields_by_name['nebula_code']) -_ATTRIBUTES.fields_by_name['nebula_code'].containing_oneof = _ATTRIBUTES.oneofs_by_name['nebula'] _SETTINGS.fields_by_name['boundary_violation_killer'].message_type = eve_dot_character_dot_character__pb2._IDENTIFIER DESCRIPTOR.message_types_by_name['Identifier'] = _IDENTIFIER DESCRIPTOR.message_types_by_name['Position'] = _POSITION diff --git a/eveProto/generated/eve/tournament/arena/layout/layout_pb2.py b/eveProto/generated/eve/tournament/arena/layout/layout_pb2.py @@ -5,7 +5,7 @@ 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.inventory import generic_item_type_pb2 as eve_dot_inventory_dot_generic__item__type__pb2 -DESCRIPTOR = _descriptor.FileDescriptor(name='eve/tournament/arena/layout/layout.proto', package='eve.tournament.arena.layout', syntax='proto3', serialized_options='ZFgithub.com/ccpgames/eve-proto-go/generated/eve/tournament/arena/layout', create_key=_descriptor._internal_create_key, serialized_pb='\n(eve/tournament/arena/layout/layout.proto\x12\x1beve.tournament.arena.layout\x1a%eve/inventory/generic_item_type.proto"\x1a\n\nIdentifier\x12\x0c\n\x04uuid\x18\x01 \x01(\x0c")\n\x06Offset\x12\t\n\x01x\x18\x01 \x01(\x12\x12\t\n\x01y\x18\x02 \x01(\x12\x12\t\n\x01z\x18\x03 \x01(\x12"\x89\x01\n\x06Object\x12\x0c\n\x04name\x18\x01 \x01(\t\x12<\n\titem_type\x18\x02 \x01(\x0b2).eve.inventory.genericitemtype.Identifier\x123\n\x06offset\x18\x03 \x01(\x0b2#.eve.tournament.arena.layout.Offset"\x8a\x01\n\x05Cloud\x12<\n\titem_type\x18\x01 \x01(\x0b2).eve.inventory.genericitemtype.Identifier\x123\n\x06offset\x18\x02 \x01(\x0b2#.eve.tournament.arena.layout.Offset\x12\x0e\n\x06radius\x18\x03 \x01(\x04"\xdb\x01\n\nAttributes\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0f\n\x07version\x18\x02 \x01(\x04\x12\x0e\n\x06radius\x18\x03 \x01(\x04\x12\x13\n\tno_nebula\x18\x04 \x01(\x08H\x00\x12\x15\n\x0bnebula_code\x18\x05 \x01(\tH\x00\x124\n\x07objects\x18\x06 \x03(\x0b2#.eve.tournament.arena.layout.Object\x122\n\x06clouds\x18\x07 \x03(\x0b2".eve.tournament.arena.layout.CloudB\x08\n\x06nebulaBHZFgithub.com/ccpgames/eve-proto-go/generated/eve/tournament/arena/layoutb\x06proto3', dependencies=[eve_dot_inventory_dot_generic__item__type__pb2.DESCRIPTOR]) +DESCRIPTOR = _descriptor.FileDescriptor(name='eve/tournament/arena/layout/layout.proto', package='eve.tournament.arena.layout', syntax='proto3', serialized_options='ZFgithub.com/ccpgames/eve-proto-go/generated/eve/tournament/arena/layout', create_key=_descriptor._internal_create_key, serialized_pb='\n(eve/tournament/arena/layout/layout.proto\x12\x1beve.tournament.arena.layout\x1a%eve/inventory/generic_item_type.proto"\x1a\n\nIdentifier\x12\x0c\n\x04uuid\x18\x01 \x01(\x0c")\n\x06Offset\x12\t\n\x01x\x18\x01 \x01(\x12\x12\t\n\x01y\x18\x02 \x01(\x12\x12\t\n\x01z\x18\x03 \x01(\x12"\x89\x01\n\x06Object\x12\x0c\n\x04name\x18\x01 \x01(\t\x12<\n\titem_type\x18\x02 \x01(\x0b2).eve.inventory.genericitemtype.Identifier\x123\n\x06offset\x18\x03 \x01(\x0b2#.eve.tournament.arena.layout.Offset"\x8a\x01\n\x05Cloud\x12<\n\titem_type\x18\x01 \x01(\x0b2).eve.inventory.genericitemtype.Identifier\x123\n\x06offset\x18\x02 \x01(\x0b2#.eve.tournament.arena.layout.Offset\x12\x0e\n\x06radius\x18\x03 \x01(\x04"\xdf\x01\n\nAttributes\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0f\n\x07version\x18\x02 \x01(\x04\x12\x0e\n\x06radius\x18\x03 \x01(\x04\x124\n\x07objects\x18\x06 \x03(\x0b2#.eve.tournament.arena.layout.Object\x122\n\x06clouds\x18\x07 \x03(\x0b2".eve.tournament.arena.layout.Cloud\x12\x14\n\x0cnebula_codes\x18\x08 \x03(\tJ\x04\x08\x04\x10\x05J\x04\x08\x05\x10\x06R\tno_nebulaR\x0bnebula_codeBHZFgithub.com/ccpgames/eve-proto-go/generated/eve/tournament/arena/layoutb\x06proto3', dependencies=[eve_dot_inventory_dot_generic__item__type__pb2.DESCRIPTOR]) _IDENTIFIER = _descriptor.Descriptor(name='Identifier', full_name='eve.tournament.arena.layout.Identifier', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='uuid', full_name='eve.tournament.arena.layout.Identifier.uuid', index=0, number=1, type=12, cpp_type=9, label=1, has_default_value=False, default_value='', 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=112, serialized_end=138) _OFFSET = _descriptor.Descriptor(name='Offset', full_name='eve.tournament.arena.layout.Offset', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='x', full_name='eve.tournament.arena.layout.Offset.x', index=0, number=1, type=18, cpp_type=2, label=1, has_default_value=False, default_value=0, 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='y', full_name='eve.tournament.arena.layout.Offset.y', index=1, number=2, type=18, cpp_type=2, label=1, has_default_value=False, default_value=0, 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='z', full_name='eve.tournament.arena.layout.Offset.z', index=2, number=3, type=18, cpp_type=2, label=1, has_default_value=False, default_value=0, 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=140, serialized_end=181) _OBJECT = _descriptor.Descriptor(name='Object', full_name='eve.tournament.arena.layout.Object', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='name', full_name='eve.tournament.arena.layout.Object.name', index=0, number=1, 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), _descriptor.FieldDescriptor(name='item_type', full_name='eve.tournament.arena.layout.Object.item_type', 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), _descriptor.FieldDescriptor(name='offset', full_name='eve.tournament.arena.layout.Object.offset', index=2, number=3, 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=184, serialized_end=321) @@ -13,20 +13,15 @@ _CLOUD = _descriptor.Descriptor(name='Cloud', full_name='eve.tournament.arena.la _ATTRIBUTES = _descriptor.Descriptor(name='Attributes', full_name='eve.tournament.arena.layout.Attributes', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='name', full_name='eve.tournament.arena.layout.Attributes.name', index=0, number=1, 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), _descriptor.FieldDescriptor(name='version', full_name='eve.tournament.arena.layout.Attributes.version', index=1, number=2, type=4, cpp_type=4, label=1, has_default_value=False, default_value=0, 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='radius', full_name='eve.tournament.arena.layout.Attributes.radius', index=2, number=3, type=4, cpp_type=4, label=1, has_default_value=False, default_value=0, 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='no_nebula', full_name='eve.tournament.arena.layout.Attributes.no_nebula', index=3, number=4, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, 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='nebula_code', full_name='eve.tournament.arena.layout.Attributes.nebula_code', index=4, number=5, 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), - _descriptor.FieldDescriptor(name='objects', full_name='eve.tournament.arena.layout.Attributes.objects', index=5, number=6, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], 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='clouds', full_name='eve.tournament.arena.layout.Attributes.clouds', index=6, number=7, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], 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=[_descriptor.OneofDescriptor(name='nebula', full_name='eve.tournament.arena.layout.Attributes.nebula', index=0, containing_type=None, create_key=_descriptor._internal_create_key, fields=[])], serialized_start=465, serialized_end=684) + _descriptor.FieldDescriptor(name='objects', full_name='eve.tournament.arena.layout.Attributes.objects', index=3, number=6, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], 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='clouds', full_name='eve.tournament.arena.layout.Attributes.clouds', index=4, number=7, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], 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='nebula_codes', full_name='eve.tournament.arena.layout.Attributes.nebula_codes', index=5, number=8, type=9, cpp_type=9, label=3, has_default_value=False, default_value=[], 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=465, serialized_end=688) _OBJECT.fields_by_name['item_type'].message_type = eve_dot_inventory_dot_generic__item__type__pb2._IDENTIFIER _OBJECT.fields_by_name['offset'].message_type = _OFFSET _CLOUD.fields_by_name['item_type'].message_type = eve_dot_inventory_dot_generic__item__type__pb2._IDENTIFIER _CLOUD.fields_by_name['offset'].message_type = _OFFSET _ATTRIBUTES.fields_by_name['objects'].message_type = _OBJECT _ATTRIBUTES.fields_by_name['clouds'].message_type = _CLOUD -_ATTRIBUTES.oneofs_by_name['nebula'].fields.append(_ATTRIBUTES.fields_by_name['no_nebula']) -_ATTRIBUTES.fields_by_name['no_nebula'].containing_oneof = _ATTRIBUTES.oneofs_by_name['nebula'] -_ATTRIBUTES.oneofs_by_name['nebula'].fields.append(_ATTRIBUTES.fields_by_name['nebula_code']) -_ATTRIBUTES.fields_by_name['nebula_code'].containing_oneof = _ATTRIBUTES.oneofs_by_name['nebula'] DESCRIPTOR.message_types_by_name['Identifier'] = _IDENTIFIER DESCRIPTOR.message_types_by_name['Offset'] = _OFFSET DESCRIPTOR.message_types_by_name['Object'] = _OBJECT diff --git a/eveProto/generated/eve/user/api/admin/__init__.py b/eveProto/generated/eve/user/api/admin/__init__.py @@ -0,0 +1,2 @@ +#Embedded file name: C:\BuildAgent\work\20d73f1b24eed06e\eve\release\V24.01\packages\eveProto\generated\eve\user\api\admin\__init__.py +pass diff --git a/eveProto/generated/eve/user/api/admin/requests_pb2.py b/eveProto/generated/eve/user/api/admin/requests_pb2.py @@ -0,0 +1,28 @@ +#Embedded file name: C:\BuildAgent\work\20d73f1b24eed06e\eve\release\V24.01\packages\eveProto\generated\eve\user\api\admin\requests_pb2.py +from google.protobuf import descriptor as _descriptor +from google.protobuf import message as _message +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.quasar.admin import admin_pb2 as eve_dot_quasar_dot_admin_dot_admin__pb2 +from eveProto.generated.eve.user import user_pb2 as eve_dot_user_dot_user__pb2 +DESCRIPTOR = _descriptor.FileDescriptor(name='eve/user/api/admin/requests.proto', package='eve.user.api.admin', syntax='proto3', serialized_options='Z=github.com/ccpgames/eve-proto-go/generated/eve/user/api/admin', create_key=_descriptor._internal_create_key, serialized_pb='\n!eve/user/api/admin/requests.proto\x12\x12eve.user.api.admin\x1a\x1ceve/quasar/admin/admin.proto\x1a\x13eve/user/user.proto"\xbb\x01\n\x16SetEmailAddressRequest\x12"\n\x04user\x18\x01 \x01(\x0b2\x14.eve.user.Identifier\x12\x15\n\remail_address\x18\x02 \x01(\t\x12\x10\n\x08verified\x18\x03 \x01(\x08\x12(\n\nadmin_user\x18\x04 \x01(\x0b2\x14.eve.user.Identifier\x12*\n\x07context\x18\x05 \x01(\x0b2\x19.eve.quasar.admin.Context"\x19\n\x17SetEmailAddressResponseB?Z=github.com/ccpgames/eve-proto-go/generated/eve/user/api/adminb\x06proto3', dependencies=[eve_dot_quasar_dot_admin_dot_admin__pb2.DESCRIPTOR, eve_dot_user_dot_user__pb2.DESCRIPTOR]) +_SETEMAILADDRESSREQUEST = _descriptor.Descriptor(name='SetEmailAddressRequest', full_name='eve.user.api.admin.SetEmailAddressRequest', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='user', full_name='eve.user.api.admin.SetEmailAddressRequest.user', 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='email_address', full_name='eve.user.api.admin.SetEmailAddressRequest.email_address', 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), + _descriptor.FieldDescriptor(name='verified', full_name='eve.user.api.admin.SetEmailAddressRequest.verified', index=2, number=3, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, 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='admin_user', full_name='eve.user.api.admin.SetEmailAddressRequest.admin_user', index=3, number=4, 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='context', full_name='eve.user.api.admin.SetEmailAddressRequest.context', index=4, number=5, 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=109, serialized_end=296) +_SETEMAILADDRESSRESPONSE = _descriptor.Descriptor(name='SetEmailAddressResponse', full_name='eve.user.api.admin.SetEmailAddressResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=298, serialized_end=323) +_SETEMAILADDRESSREQUEST.fields_by_name['user'].message_type = eve_dot_user_dot_user__pb2._IDENTIFIER +_SETEMAILADDRESSREQUEST.fields_by_name['admin_user'].message_type = eve_dot_user_dot_user__pb2._IDENTIFIER +_SETEMAILADDRESSREQUEST.fields_by_name['context'].message_type = eve_dot_quasar_dot_admin_dot_admin__pb2._CONTEXT +DESCRIPTOR.message_types_by_name['SetEmailAddressRequest'] = _SETEMAILADDRESSREQUEST +DESCRIPTOR.message_types_by_name['SetEmailAddressResponse'] = _SETEMAILADDRESSRESPONSE +_sym_db.RegisterFileDescriptor(DESCRIPTOR) +SetEmailAddressRequest = _reflection.GeneratedProtocolMessageType('SetEmailAddressRequest', (_message.Message,), {'DESCRIPTOR': _SETEMAILADDRESSREQUEST, + '__module__': 'eve.user.api.admin.requests_pb2'}) +_sym_db.RegisterMessage(SetEmailAddressRequest) +SetEmailAddressResponse = _reflection.GeneratedProtocolMessageType('SetEmailAddressResponse', (_message.Message,), {'DESCRIPTOR': _SETEMAILADDRESSRESPONSE, + '__module__': 'eve.user.api.admin.requests_pb2'}) +_sym_db.RegisterMessage(SetEmailAddressResponse) +DESCRIPTOR._options = None diff --git a/eveProto/generated/eve/user/api/requests_pb2.py b/eveProto/generated/eve/user/api/requests_pb2.py @@ -5,31 +5,42 @@ 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.character import character_pb2 as eve_dot_character_dot_character__pb2 +from eveProto.generated.eve import eve_pb2 as eve_dot_eve__pb2 from eveProto.generated.eve import ipaddress_pb2 as eve_dot_ipaddress__pb2 from eveProto.generated.eve.user import user_pb2 as eve_dot_user_dot_user__pb2 from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2 -DESCRIPTOR = _descriptor.FileDescriptor(name='eve/user/api/requests.proto', package='eve.user.api', syntax='proto3', serialized_options='Z7github.com/ccpgames/eve-proto-go/generated/eve/user/api', create_key=_descriptor._internal_create_key, serialized_pb='\n\x1beve/user/api/requests.proto\x12\x0ceve.user.api\x1a\x1deve/character/character.proto\x1a\x13eve/ipaddress.proto\x1a\x13eve/user/user.proto\x1a\x1fgoogle/protobuf/timestamp.proto"?\n\x19DeletePersonalDataRequest\x12"\n\x04user\x18\x01 \x01(\x0b2\x14.eve.user.Identifier"\x1c\n\x1aDeletePersonalDataResponse"u\n\rCreateRequest\x12\x15\n\remail_address\x18\x01 \x01(\t\x12\x14\n\x0ccountry_code\x18\x02 \x01(\t\x12"\n\nip_address\x18\x03 \x01(\x0b2\x0e.eve.IPAddress\x12\x13\n\x0bagreed_eula\x18\x04 \x01(\x08"4\n\x0eCreateResponse\x12"\n\x04user\x18\x01 \x01(\x0b2\x14.eve.user.Identifier"%\n\x14GetAllByEmailRequest\x12\r\n\x05email\x18\x01 \x01(\t"<\n\x15GetAllByEmailResponse\x12#\n\x05users\x18\x01 \x03(\x0b2\x14.eve.user.Identifier"7\n\x11GetDetailsRequest\x12"\n\x04user\x18\x01 \x01(\x0b2\x14.eve.user.Identifier"\xf2\x02\n\x12GetDetailsResponse\x12\x0c\n\x04name\x18\x01 \x01(\t\x12+\n\x07created\x18\x02 \x01(\x0b2\x1a.google.protobuf.Timestamp\x12?\n\remail_address\x18\x03 \x01(\x0b2&.eve.user.api.GetDetailsResponse.EmailH\x00\x12\x12\n\x08no_email\x18\x04 \x01(\x08H\x00\x12>\n\ncharacters\x18\x05 \x03(\x0b2*.eve.user.api.GetDetailsResponse.Character\x12\x0e\n\x06banned\x18\x06 \x01(\x08\x1aG\n\tCharacter\x12,\n\tcharacter\x18\x01 \x01(\x0b2\x19.eve.character.Identifier\x12\x0c\n\x04name\x18\x02 \x01(\t\x1a*\n\x05Email\x12\x0f\n\x07address\x18\x01 \x01(\t\x12\x10\n\x08verified\x18\x02 \x01(\x08B\x07\n\x05emailB9Z7github.com/ccpgames/eve-proto-go/generated/eve/user/apib\x06proto3', dependencies=[eve_dot_character_dot_character__pb2.DESCRIPTOR, +DESCRIPTOR = _descriptor.FileDescriptor(name='eve/user/api/requests.proto', package='eve.user.api', syntax='proto3', serialized_options='Z7github.com/ccpgames/eve-proto-go/generated/eve/user/api', create_key=_descriptor._internal_create_key, serialized_pb='\n\x1beve/user/api/requests.proto\x12\x0ceve.user.api\x1a\x1deve/character/character.proto\x1a\reve/eve.proto\x1a\x13eve/ipaddress.proto\x1a\x13eve/user/user.proto\x1a\x1fgoogle/protobuf/timestamp.proto"?\n\x19DeletePersonalDataRequest\x12"\n\x04user\x18\x01 \x01(\x0b2\x14.eve.user.Identifier"\x1c\n\x1aDeletePersonalDataResponse"u\n\rCreateRequest\x12\x15\n\remail_address\x18\x01 \x01(\t\x12\x14\n\x0ccountry_code\x18\x02 \x01(\t\x12"\n\nip_address\x18\x03 \x01(\x0b2\x0e.eve.IPAddress\x12\x13\n\x0bagreed_eula\x18\x04 \x01(\x08"4\n\x0eCreateResponse\x12"\n\x04user\x18\x01 \x01(\x0b2\x14.eve.user.Identifier"%\n\x14GetAllByEmailRequest\x12\r\n\x05email\x18\x01 \x01(\t"<\n\x15GetAllByEmailResponse\x12#\n\x05users\x18\x01 \x03(\x0b2\x14.eve.user.Identifier"7\n\x11GetDetailsRequest\x12"\n\x04user\x18\x01 \x01(\x0b2\x14.eve.user.Identifier"\xf2\x02\n\x12GetDetailsResponse\x12\x0c\n\x04name\x18\x01 \x01(\t\x12+\n\x07created\x18\x02 \x01(\x0b2\x1a.google.protobuf.Timestamp\x12?\n\remail_address\x18\x03 \x01(\x0b2&.eve.user.api.GetDetailsResponse.EmailH\x00\x12\x12\n\x08no_email\x18\x04 \x01(\x08H\x00\x12>\n\ncharacters\x18\x05 \x03(\x0b2*.eve.user.api.GetDetailsResponse.Character\x12\x0e\n\x06banned\x18\x06 \x01(\x08\x1aG\n\tCharacter\x12,\n\tcharacter\x18\x01 \x01(\x0b2\x19.eve.character.Identifier\x12\x0c\n\x04name\x18\x02 \x01(\t\x1a*\n\x05Email\x12\x0f\n\x07address\x18\x01 \x01(\t\x12\x10\n\x08verified\x18\x02 \x01(\x08B\x07\n\x05email"P\n\x11GetHistoryRequest\x12"\n\x04user\x18\x01 \x01(\x0b2\x14.eve.user.Identifier\x12\x17\n\x04page\x18\x02 \x01(\x0b2\t.eve.Page"\xe5\x01\n\x12GetHistoryResponse\x126\n\x06events\x18\x01 \x03(\x0b2&.eve.user.api.GetHistoryResponse.Event\x12 \n\tnext_page\x18\x02 \x01(\x0b2\r.eve.NextPage\x1au\n\x05Event\x12\n\n\x02id\x18\x01 \x01(\x03\x12/\n\x0bcreate_date\x18\x02 \x01(\x0b2\x1a.google.protobuf.Timestamp\x12\x12\n\nevent_name\x18\x03 \x01(\t\x12\x0f\n\x07context\x18\x04 \x01(\t\x12\n\n\x02ip\x18\x05 \x01(\t"B\n\x1cCreateDefaultContactsRequest\x12"\n\x04user\x18\x01 \x01(\x0b2\x14.eve.user.Identifier"\x1f\n\x1dCreateDefaultContactsResponseB9Z7github.com/ccpgames/eve-proto-go/generated/eve/user/apib\x06proto3', dependencies=[eve_dot_character_dot_character__pb2.DESCRIPTOR, + eve_dot_eve__pb2.DESCRIPTOR, eve_dot_ipaddress__pb2.DESCRIPTOR, eve_dot_user_dot_user__pb2.DESCRIPTOR, google_dot_protobuf_dot_timestamp__pb2.DESCRIPTOR]) -_DELETEPERSONALDATAREQUEST = _descriptor.Descriptor(name='DeletePersonalDataRequest', full_name='eve.user.api.DeletePersonalDataRequest', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='user', full_name='eve.user.api.DeletePersonalDataRequest.user', 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=151, serialized_end=214) -_DELETEPERSONALDATARESPONSE = _descriptor.Descriptor(name='DeletePersonalDataResponse', full_name='eve.user.api.DeletePersonalDataResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=216, serialized_end=244) +_DELETEPERSONALDATAREQUEST = _descriptor.Descriptor(name='DeletePersonalDataRequest', full_name='eve.user.api.DeletePersonalDataRequest', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='user', full_name='eve.user.api.DeletePersonalDataRequest.user', 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=166, serialized_end=229) +_DELETEPERSONALDATARESPONSE = _descriptor.Descriptor(name='DeletePersonalDataResponse', full_name='eve.user.api.DeletePersonalDataResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=231, serialized_end=259) _CREATEREQUEST = _descriptor.Descriptor(name='CreateRequest', full_name='eve.user.api.CreateRequest', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='email_address', full_name='eve.user.api.CreateRequest.email_address', index=0, number=1, 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), _descriptor.FieldDescriptor(name='country_code', full_name='eve.user.api.CreateRequest.country_code', 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), _descriptor.FieldDescriptor(name='ip_address', full_name='eve.user.api.CreateRequest.ip_address', index=2, number=3, 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='agreed_eula', full_name='eve.user.api.CreateRequest.agreed_eula', index=3, number=4, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, 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=246, serialized_end=363) -_CREATERESPONSE = _descriptor.Descriptor(name='CreateResponse', full_name='eve.user.api.CreateResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='user', full_name='eve.user.api.CreateResponse.user', 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=365, serialized_end=417) -_GETALLBYEMAILREQUEST = _descriptor.Descriptor(name='GetAllByEmailRequest', full_name='eve.user.api.GetAllByEmailRequest', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='email', full_name='eve.user.api.GetAllByEmailRequest.email', index=0, number=1, 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=419, serialized_end=456) -_GETALLBYEMAILRESPONSE = _descriptor.Descriptor(name='GetAllByEmailResponse', full_name='eve.user.api.GetAllByEmailResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='users', full_name='eve.user.api.GetAllByEmailResponse.users', index=0, number=1, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], 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=458, serialized_end=518) -_GETDETAILSREQUEST = _descriptor.Descriptor(name='GetDetailsRequest', full_name='eve.user.api.GetDetailsRequest', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='user', full_name='eve.user.api.GetDetailsRequest.user', 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=520, serialized_end=575) -_GETDETAILSRESPONSE_CHARACTER = _descriptor.Descriptor(name='Character', full_name='eve.user.api.GetDetailsResponse.Character', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='character', full_name='eve.user.api.GetDetailsResponse.Character.character', 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='name', full_name='eve.user.api.GetDetailsResponse.Character.name', 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=824, serialized_end=895) -_GETDETAILSRESPONSE_EMAIL = _descriptor.Descriptor(name='Email', full_name='eve.user.api.GetDetailsResponse.Email', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='address', full_name='eve.user.api.GetDetailsResponse.Email.address', index=0, number=1, 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), _descriptor.FieldDescriptor(name='verified', full_name='eve.user.api.GetDetailsResponse.Email.verified', index=1, number=2, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, 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=897, serialized_end=939) + _descriptor.FieldDescriptor(name='agreed_eula', full_name='eve.user.api.CreateRequest.agreed_eula', index=3, number=4, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, 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=261, serialized_end=378) +_CREATERESPONSE = _descriptor.Descriptor(name='CreateResponse', full_name='eve.user.api.CreateResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='user', full_name='eve.user.api.CreateResponse.user', 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=380, serialized_end=432) +_GETALLBYEMAILREQUEST = _descriptor.Descriptor(name='GetAllByEmailRequest', full_name='eve.user.api.GetAllByEmailRequest', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='email', full_name='eve.user.api.GetAllByEmailRequest.email', index=0, number=1, 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=434, serialized_end=471) +_GETALLBYEMAILRESPONSE = _descriptor.Descriptor(name='GetAllByEmailResponse', full_name='eve.user.api.GetAllByEmailResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='users', full_name='eve.user.api.GetAllByEmailResponse.users', index=0, number=1, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], 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=473, serialized_end=533) +_GETDETAILSREQUEST = _descriptor.Descriptor(name='GetDetailsRequest', full_name='eve.user.api.GetDetailsRequest', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='user', full_name='eve.user.api.GetDetailsRequest.user', 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=535, serialized_end=590) +_GETDETAILSRESPONSE_CHARACTER = _descriptor.Descriptor(name='Character', full_name='eve.user.api.GetDetailsResponse.Character', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='character', full_name='eve.user.api.GetDetailsResponse.Character.character', 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='name', full_name='eve.user.api.GetDetailsResponse.Character.name', 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=839, serialized_end=910) +_GETDETAILSRESPONSE_EMAIL = _descriptor.Descriptor(name='Email', full_name='eve.user.api.GetDetailsResponse.Email', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='address', full_name='eve.user.api.GetDetailsResponse.Email.address', index=0, number=1, 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), _descriptor.FieldDescriptor(name='verified', full_name='eve.user.api.GetDetailsResponse.Email.verified', index=1, number=2, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, 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=912, serialized_end=954) _GETDETAILSRESPONSE = _descriptor.Descriptor(name='GetDetailsResponse', full_name='eve.user.api.GetDetailsResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='name', full_name='eve.user.api.GetDetailsResponse.name', index=0, number=1, 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), _descriptor.FieldDescriptor(name='created', full_name='eve.user.api.GetDetailsResponse.created', 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), _descriptor.FieldDescriptor(name='email_address', full_name='eve.user.api.GetDetailsResponse.email_address', index=2, number=3, 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='no_email', full_name='eve.user.api.GetDetailsResponse.no_email', index=3, number=4, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, 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='characters', full_name='eve.user.api.GetDetailsResponse.characters', index=4, number=5, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], 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='banned', full_name='eve.user.api.GetDetailsResponse.banned', index=5, number=6, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, 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=[_GETDETAILSRESPONSE_CHARACTER, _GETDETAILSRESPONSE_EMAIL], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[_descriptor.OneofDescriptor(name='email', full_name='eve.user.api.GetDetailsResponse.email', index=0, containing_type=None, create_key=_descriptor._internal_create_key, fields=[])], serialized_start=578, serialized_end=948) + _descriptor.FieldDescriptor(name='banned', full_name='eve.user.api.GetDetailsResponse.banned', index=5, number=6, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, 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=[_GETDETAILSRESPONSE_CHARACTER, _GETDETAILSRESPONSE_EMAIL], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[_descriptor.OneofDescriptor(name='email', full_name='eve.user.api.GetDetailsResponse.email', index=0, containing_type=None, create_key=_descriptor._internal_create_key, fields=[])], serialized_start=593, serialized_end=963) +_GETHISTORYREQUEST = _descriptor.Descriptor(name='GetHistoryRequest', full_name='eve.user.api.GetHistoryRequest', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='user', full_name='eve.user.api.GetHistoryRequest.user', 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='page', full_name='eve.user.api.GetHistoryRequest.page', 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=965, serialized_end=1045) +_GETHISTORYRESPONSE_EVENT = _descriptor.Descriptor(name='Event', full_name='eve.user.api.GetHistoryResponse.Event', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='id', full_name='eve.user.api.GetHistoryResponse.Event.id', index=0, number=1, type=3, cpp_type=2, label=1, has_default_value=False, default_value=0, 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='create_date', full_name='eve.user.api.GetHistoryResponse.Event.create_date', 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), + _descriptor.FieldDescriptor(name='event_name', full_name='eve.user.api.GetHistoryResponse.Event.event_name', index=2, number=3, 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), + _descriptor.FieldDescriptor(name='context', full_name='eve.user.api.GetHistoryResponse.Event.context', index=3, number=4, 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), + _descriptor.FieldDescriptor(name='ip', full_name='eve.user.api.GetHistoryResponse.Event.ip', index=4, number=5, 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=1160, serialized_end=1277) +_GETHISTORYRESPONSE = _descriptor.Descriptor(name='GetHistoryResponse', full_name='eve.user.api.GetHistoryResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='events', full_name='eve.user.api.GetHistoryResponse.events', index=0, number=1, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], 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='next_page', full_name='eve.user.api.GetHistoryResponse.next_page', 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=[_GETHISTORYRESPONSE_EVENT], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=1048, serialized_end=1277) +_CREATEDEFAULTCONTACTSREQUEST = _descriptor.Descriptor(name='CreateDefaultContactsRequest', full_name='eve.user.api.CreateDefaultContactsRequest', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='user', full_name='eve.user.api.CreateDefaultContactsRequest.user', 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=1279, serialized_end=1345) +_CREATEDEFAULTCONTACTSRESPONSE = _descriptor.Descriptor(name='CreateDefaultContactsResponse', full_name='eve.user.api.CreateDefaultContactsResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=1347, serialized_end=1378) _DELETEPERSONALDATAREQUEST.fields_by_name['user'].message_type = eve_dot_user_dot_user__pb2._IDENTIFIER _CREATEREQUEST.fields_by_name['ip_address'].message_type = eve_dot_ipaddress__pb2._IPADDRESS _CREATERESPONSE.fields_by_name['user'].message_type = eve_dot_user_dot_user__pb2._IDENTIFIER @@ -45,6 +56,13 @@ _GETDETAILSRESPONSE.oneofs_by_name['email'].fields.append(_GETDETAILSRESPONSE.fi _GETDETAILSRESPONSE.fields_by_name['email_address'].containing_oneof = _GETDETAILSRESPONSE.oneofs_by_name['email'] _GETDETAILSRESPONSE.oneofs_by_name['email'].fields.append(_GETDETAILSRESPONSE.fields_by_name['no_email']) _GETDETAILSRESPONSE.fields_by_name['no_email'].containing_oneof = _GETDETAILSRESPONSE.oneofs_by_name['email'] +_GETHISTORYREQUEST.fields_by_name['user'].message_type = eve_dot_user_dot_user__pb2._IDENTIFIER +_GETHISTORYREQUEST.fields_by_name['page'].message_type = eve_dot_eve__pb2._PAGE +_GETHISTORYRESPONSE_EVENT.fields_by_name['create_date'].message_type = google_dot_protobuf_dot_timestamp__pb2._TIMESTAMP +_GETHISTORYRESPONSE_EVENT.containing_type = _GETHISTORYRESPONSE +_GETHISTORYRESPONSE.fields_by_name['events'].message_type = _GETHISTORYRESPONSE_EVENT +_GETHISTORYRESPONSE.fields_by_name['next_page'].message_type = eve_dot_eve__pb2._NEXTPAGE +_CREATEDEFAULTCONTACTSREQUEST.fields_by_name['user'].message_type = eve_dot_user_dot_user__pb2._IDENTIFIER DESCRIPTOR.message_types_by_name['DeletePersonalDataRequest'] = _DELETEPERSONALDATAREQUEST DESCRIPTOR.message_types_by_name['DeletePersonalDataResponse'] = _DELETEPERSONALDATARESPONSE DESCRIPTOR.message_types_by_name['CreateRequest'] = _CREATEREQUEST @@ -53,6 +71,10 @@ DESCRIPTOR.message_types_by_name['GetAllByEmailRequest'] = _GETALLBYEMAILREQUEST DESCRIPTOR.message_types_by_name['GetAllByEmailResponse'] = _GETALLBYEMAILRESPONSE DESCRIPTOR.message_types_by_name['GetDetailsRequest'] = _GETDETAILSREQUEST DESCRIPTOR.message_types_by_name['GetDetailsResponse'] = _GETDETAILSRESPONSE +DESCRIPTOR.message_types_by_name['GetHistoryRequest'] = _GETHISTORYREQUEST +DESCRIPTOR.message_types_by_name['GetHistoryResponse'] = _GETHISTORYRESPONSE +DESCRIPTOR.message_types_by_name['CreateDefaultContactsRequest'] = _CREATEDEFAULTCONTACTSREQUEST +DESCRIPTOR.message_types_by_name['CreateDefaultContactsResponse'] = _CREATEDEFAULTCONTACTSRESPONSE _sym_db.RegisterFileDescriptor(DESCRIPTOR) DeletePersonalDataRequest = _reflection.GeneratedProtocolMessageType('DeletePersonalDataRequest', (_message.Message,), {'DESCRIPTOR': _DELETEPERSONALDATAREQUEST, '__module__': 'eve.user.api.requests_pb2'}) @@ -84,4 +106,19 @@ GetDetailsResponse = _reflection.GeneratedProtocolMessageType('GetDetailsRespons _sym_db.RegisterMessage(GetDetailsResponse) _sym_db.RegisterMessage(GetDetailsResponse.Character) _sym_db.RegisterMessage(GetDetailsResponse.Email) +GetHistoryRequest = _reflection.GeneratedProtocolMessageType('GetHistoryRequest', (_message.Message,), {'DESCRIPTOR': _GETHISTORYREQUEST, + '__module__': 'eve.user.api.requests_pb2'}) +_sym_db.RegisterMessage(GetHistoryRequest) +GetHistoryResponse = _reflection.GeneratedProtocolMessageType('GetHistoryResponse', (_message.Message,), {'Event': _reflection.GeneratedProtocolMessageType('Event', (_message.Message,), {'DESCRIPTOR': _GETHISTORYRESPONSE_EVENT, + '__module__': 'eve.user.api.requests_pb2'}), + 'DESCRIPTOR': _GETHISTORYRESPONSE, + '__module__': 'eve.user.api.requests_pb2'}) +_sym_db.RegisterMessage(GetHistoryResponse) +_sym_db.RegisterMessage(GetHistoryResponse.Event) +CreateDefaultContactsRequest = _reflection.GeneratedProtocolMessageType('CreateDefaultContactsRequest', (_message.Message,), {'DESCRIPTOR': _CREATEDEFAULTCONTACTSREQUEST, + '__module__': 'eve.user.api.requests_pb2'}) +_sym_db.RegisterMessage(CreateDefaultContactsRequest) +CreateDefaultContactsResponse = _reflection.GeneratedProtocolMessageType('CreateDefaultContactsResponse', (_message.Message,), {'DESCRIPTOR': _CREATEDEFAULTCONTACTSRESPONSE, + '__module__': 'eve.user.api.requests_pb2'}) +_sym_db.RegisterMessage(CreateDefaultContactsResponse) DESCRIPTOR._options = None diff --git a/eveProto/generated/eve/user/legal/__init__.py b/eveProto/generated/eve/user/legal/__init__.py @@ -0,0 +1,2 @@ +#Embedded file name: C:\BuildAgent\work\20d73f1b24eed06e\eve\release\V24.01\packages\eveProto\generated\eve\user\legal\__init__.py +pass diff --git a/eveProto/generated/eve/user/legal/agreement/__init__.py b/eveProto/generated/eve/user/legal/agreement/__init__.py @@ -0,0 +1,2 @@ +#Embedded file name: C:\BuildAgent\work\20d73f1b24eed06e\eve\release\V24.01\packages\eveProto\generated\eve\user\legal\agreement\__init__.py +pass diff --git a/eveProto/generated/eve/user/legal/agreement/api/__init__.py b/eveProto/generated/eve/user/legal/agreement/api/__init__.py @@ -0,0 +1,2 @@ +#Embedded file name: C:\BuildAgent\work\20d73f1b24eed06e\eve\release\V24.01\packages\eveProto\generated\eve\user\legal\agreement\api\__init__.py +pass diff --git a/eveProto/generated/eve/user/legal/agreement/api/requests_pb2.py b/eveProto/generated/eve/user/legal/agreement/api/requests_pb2.py @@ -0,0 +1,61 @@ +#Embedded file name: C:\BuildAgent\work\20d73f1b24eed06e\eve\release\V24.01\packages\eveProto\generated\eve\user\legal\agreement\api\requests_pb2.py +from google.protobuf import descriptor as _descriptor +from google.protobuf import message as _message +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 import eve_pb2 as eve_dot_eve__pb2 +from eveProto.generated.eve.legal.agreement import agreement_pb2 as eve_dot_legal_dot_agreement_dot_agreement__pb2 +from eveProto.generated.eve.user import user_pb2 as eve_dot_user_dot_user__pb2 +DESCRIPTOR = _descriptor.FileDescriptor(name='eve/user/legal/agreement/api/requests.proto', package='eve.user.legal.agreement.api', syntax='proto3', serialized_options='ZGgithub.com/ccpgames/eve-proto-go/generated/eve/user/legal/agreement/api', create_key=_descriptor._internal_create_key, serialized_pb='\n+eve/user/legal/agreement/api/requests.proto\x12\x1ceve.user.legal.agreement.api\x1a\reve/eve.proto\x1a#eve/legal/agreement/agreement.proto\x1a\x13eve/user/user.proto"\xc2\x01\n\rAcceptRequest\x12"\n\x04user\x18\x01 \x01(\x0b2\x14.eve.user.Identifier\x129\n\x0eagreement_type\x18\x02 \x01(\x0e2!.eve.legal.agreement.DocumentType\x125\n\x02id\x18\x03 \x01(\x0b2\'.eve.legal.agreement.DocumentIdentifierH\x00\x12\x10\n\x06latest\x18\x04 \x01(\x08H\x00B\t\n\x07version"\x10\n\x0eAcceptResponse"S\n\x14GetAgreementsRequest\x12"\n\x04user\x18\x01 \x01(\x0b2\x14.eve.user.Identifier\x12\x17\n\x04page\x18\x02 \x01(\x0b2\t.eve.Page"i\n\x15GetAgreementsResponse\x12.\n\nagreements\x18\x01 \x03(\x0b2\x1a.eve.legal.agreement.Entry\x12 \n\tnext_page\x18\x02 \x01(\x0b2\r.eve.NextPage"\x94\x01\n\x1aGetAgreementsOfTypeRequest\x12"\n\x04user\x18\x01 \x01(\x0b2\x14.eve.user.Identifier\x129\n\x0eagreement_type\x18\x02 \x01(\x0e2!.eve.legal.agreement.DocumentType\x12\x17\n\x04page\x18\x03 \x01(\x0b2\t.eve.Page"o\n\x1bGetAgreementsOfTypeResponse\x12.\n\nagreements\x18\x01 \x03(\x0b2\x1a.eve.legal.agreement.Entry\x12 \n\tnext_page\x18\x02 \x01(\x0b2\r.eve.NextPageBIZGgithub.com/ccpgames/eve-proto-go/generated/eve/user/legal/agreement/apib\x06proto3', dependencies=[eve_dot_eve__pb2.DESCRIPTOR, eve_dot_legal_dot_agreement_dot_agreement__pb2.DESCRIPTOR, eve_dot_user_dot_user__pb2.DESCRIPTOR]) +_ACCEPTREQUEST = _descriptor.Descriptor(name='AcceptRequest', full_name='eve.user.legal.agreement.api.AcceptRequest', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='user', full_name='eve.user.legal.agreement.api.AcceptRequest.user', 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='agreement_type', full_name='eve.user.legal.agreement.api.AcceptRequest.agreement_type', index=1, number=2, type=14, cpp_type=8, label=1, has_default_value=False, default_value=0, 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='id', full_name='eve.user.legal.agreement.api.AcceptRequest.id', index=2, number=3, 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='latest', full_name='eve.user.legal.agreement.api.AcceptRequest.latest', index=3, number=4, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, 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=[_descriptor.OneofDescriptor(name='version', full_name='eve.user.legal.agreement.api.AcceptRequest.version', index=0, containing_type=None, create_key=_descriptor._internal_create_key, fields=[])], serialized_start=151, serialized_end=345) +_ACCEPTRESPONSE = _descriptor.Descriptor(name='AcceptResponse', full_name='eve.user.legal.agreement.api.AcceptResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=347, serialized_end=363) +_GETAGREEMENTSREQUEST = _descriptor.Descriptor(name='GetAgreementsRequest', full_name='eve.user.legal.agreement.api.GetAgreementsRequest', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='user', full_name='eve.user.legal.agreement.api.GetAgreementsRequest.user', 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='page', full_name='eve.user.legal.agreement.api.GetAgreementsRequest.page', 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=365, serialized_end=448) +_GETAGREEMENTSRESPONSE = _descriptor.Descriptor(name='GetAgreementsResponse', full_name='eve.user.legal.agreement.api.GetAgreementsResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='agreements', full_name='eve.user.legal.agreement.api.GetAgreementsResponse.agreements', index=0, number=1, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], 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='next_page', full_name='eve.user.legal.agreement.api.GetAgreementsResponse.next_page', 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=450, serialized_end=555) +_GETAGREEMENTSOFTYPEREQUEST = _descriptor.Descriptor(name='GetAgreementsOfTypeRequest', full_name='eve.user.legal.agreement.api.GetAgreementsOfTypeRequest', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='user', full_name='eve.user.legal.agreement.api.GetAgreementsOfTypeRequest.user', 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='agreement_type', full_name='eve.user.legal.agreement.api.GetAgreementsOfTypeRequest.agreement_type', index=1, number=2, type=14, cpp_type=8, label=1, has_default_value=False, default_value=0, 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='page', full_name='eve.user.legal.agreement.api.GetAgreementsOfTypeRequest.page', index=2, number=3, 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=558, serialized_end=706) +_GETAGREEMENTSOFTYPERESPONSE = _descriptor.Descriptor(name='GetAgreementsOfTypeResponse', full_name='eve.user.legal.agreement.api.GetAgreementsOfTypeResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='agreements', full_name='eve.user.legal.agreement.api.GetAgreementsOfTypeResponse.agreements', index=0, number=1, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], 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='next_page', full_name='eve.user.legal.agreement.api.GetAgreementsOfTypeResponse.next_page', 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=708, serialized_end=819) +_ACCEPTREQUEST.fields_by_name['user'].message_type = eve_dot_user_dot_user__pb2._IDENTIFIER +_ACCEPTREQUEST.fields_by_name['agreement_type'].enum_type = eve_dot_legal_dot_agreement_dot_agreement__pb2._DOCUMENTTYPE +_ACCEPTREQUEST.fields_by_name['id'].message_type = eve_dot_legal_dot_agreement_dot_agreement__pb2._DOCUMENTIDENTIFIER +_ACCEPTREQUEST.oneofs_by_name['version'].fields.append(_ACCEPTREQUEST.fields_by_name['id']) +_ACCEPTREQUEST.fields_by_name['id'].containing_oneof = _ACCEPTREQUEST.oneofs_by_name['version'] +_ACCEPTREQUEST.oneofs_by_name['version'].fields.append(_ACCEPTREQUEST.fields_by_name['latest']) +_ACCEPTREQUEST.fields_by_name['latest'].containing_oneof = _ACCEPTREQUEST.oneofs_by_name['version'] +_GETAGREEMENTSREQUEST.fields_by_name['user'].message_type = eve_dot_user_dot_user__pb2._IDENTIFIER +_GETAGREEMENTSREQUEST.fields_by_name['page'].message_type = eve_dot_eve__pb2._PAGE +_GETAGREEMENTSRESPONSE.fields_by_name['agreements'].message_type = eve_dot_legal_dot_agreement_dot_agreement__pb2._ENTRY +_GETAGREEMENTSRESPONSE.fields_by_name['next_page'].message_type = eve_dot_eve__pb2._NEXTPAGE +_GETAGREEMENTSOFTYPEREQUEST.fields_by_name['user'].message_type = eve_dot_user_dot_user__pb2._IDENTIFIER +_GETAGREEMENTSOFTYPEREQUEST.fields_by_name['agreement_type'].enum_type = eve_dot_legal_dot_agreement_dot_agreement__pb2._DOCUMENTTYPE +_GETAGREEMENTSOFTYPEREQUEST.fields_by_name['page'].message_type = eve_dot_eve__pb2._PAGE +_GETAGREEMENTSOFTYPERESPONSE.fields_by_name['agreements'].message_type = eve_dot_legal_dot_agreement_dot_agreement__pb2._ENTRY +_GETAGREEMENTSOFTYPERESPONSE.fields_by_name['next_page'].message_type = eve_dot_eve__pb2._NEXTPAGE +DESCRIPTOR.message_types_by_name['AcceptRequest'] = _ACCEPTREQUEST +DESCRIPTOR.message_types_by_name['AcceptResponse'] = _ACCEPTRESPONSE +DESCRIPTOR.message_types_by_name['GetAgreementsRequest'] = _GETAGREEMENTSREQUEST +DESCRIPTOR.message_types_by_name['GetAgreementsResponse'] = _GETAGREEMENTSRESPONSE +DESCRIPTOR.message_types_by_name['GetAgreementsOfTypeRequest'] = _GETAGREEMENTSOFTYPEREQUEST +DESCRIPTOR.message_types_by_name['GetAgreementsOfTypeResponse'] = _GETAGREEMENTSOFTYPERESPONSE +_sym_db.RegisterFileDescriptor(DESCRIPTOR) +AcceptRequest = _reflection.GeneratedProtocolMessageType('AcceptRequest', (_message.Message,), {'DESCRIPTOR': _ACCEPTREQUEST, + '__module__': 'eve.user.legal.agreement.api.requests_pb2'}) +_sym_db.RegisterMessage(AcceptRequest) +AcceptResponse = _reflection.GeneratedProtocolMessageType('AcceptResponse', (_message.Message,), {'DESCRIPTOR': _ACCEPTRESPONSE, + '__module__': 'eve.user.legal.agreement.api.requests_pb2'}) +_sym_db.RegisterMessage(AcceptResponse) +GetAgreementsRequest = _reflection.GeneratedProtocolMessageType('GetAgreementsRequest', (_message.Message,), {'DESCRIPTOR': _GETAGREEMENTSREQUEST, + '__module__': 'eve.user.legal.agreement.api.requests_pb2'}) +_sym_db.RegisterMessage(GetAgreementsRequest) +GetAgreementsResponse = _reflection.GeneratedProtocolMessageType('GetAgreementsResponse', (_message.Message,), {'DESCRIPTOR': _GETAGREEMENTSRESPONSE, + '__module__': 'eve.user.legal.agreement.api.requests_pb2'}) +_sym_db.RegisterMessage(GetAgreementsResponse) +GetAgreementsOfTypeRequest = _reflection.GeneratedProtocolMessageType('GetAgreementsOfTypeRequest', (_message.Message,), {'DESCRIPTOR': _GETAGREEMENTSOFTYPEREQUEST, + '__module__': 'eve.user.legal.agreement.api.requests_pb2'}) +_sym_db.RegisterMessage(GetAgreementsOfTypeRequest) +GetAgreementsOfTypeResponse = _reflection.GeneratedProtocolMessageType('GetAgreementsOfTypeResponse', (_message.Message,), {'DESCRIPTOR': _GETAGREEMENTSOFTYPERESPONSE, + '__module__': 'eve.user.legal.agreement.api.requests_pb2'}) +_sym_db.RegisterMessage(GetAgreementsOfTypeResponse) +DESCRIPTOR._options = None diff --git a/eveProto/generated/eve/user/license/api/admin/__init__.py b/eveProto/generated/eve/user/license/api/admin/__init__.py @@ -0,0 +1,2 @@ +#Embedded file name: C:\BuildAgent\work\20d73f1b24eed06e\eve\release\V24.01\packages\eveProto\generated\eve\user\license\api\admin\__init__.py +pass diff --git a/eveProto/generated/eve/user/license/api/admin/requests_pb2.py b/eveProto/generated/eve/user/license/api/admin/requests_pb2.py @@ -0,0 +1,46 @@ +#Embedded file name: C:\BuildAgent\work\20d73f1b24eed06e\eve\release\V24.01\packages\eveProto\generated\eve\user\license\api\admin\requests_pb2.py +from google.protobuf import descriptor as _descriptor +from google.protobuf import message as _message +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.quasar.admin import admin_pb2 as eve_dot_quasar_dot_admin_dot_admin__pb2 +from eveProto.generated.eve.user.license import license_pb2 as eve_dot_user_dot_license_dot_license__pb2 +from eveProto.generated.eve.user import user_pb2 as eve_dot_user_dot_user__pb2 +from google.protobuf import duration_pb2 as google_dot_protobuf_dot_duration__pb2 +from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2 +DESCRIPTOR = _descriptor.FileDescriptor(name='eve/user/license/api/admin/requests.proto', package='eve.user.license.api.admin', syntax='proto3', serialized_options='ZEgithub.com/ccpgames/eve-proto-go/generated/eve/user/license/api/admin', create_key=_descriptor._internal_create_key, serialized_pb='\n)eve/user/license/api/admin/requests.proto\x12\x1aeve.user.license.api.admin\x1a\x1ceve/quasar/admin/admin.proto\x1a\x1eeve/user/license/license.proto\x1a\x13eve/user/user.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x1fgoogle/protobuf/timestamp.proto"\xb7\x02\n\x17UpsertWithExpiryRequest\x12-\n\x07license\x18\x01 \x01(\x0b2\x1c.eve.user.license.Identifier\x121\n\x0bexpiry_date\x18\x02 \x01(\x0b2\x1a.google.protobuf.TimestampH\x00\x121\n\x0cadd_duration\x18\x03 \x01(\x0b2\x19.google.protobuf.DurationH\x00\x12\x14\n\nexpire_now\x18\x04 \x01(\x08H\x00\x12(\n\nadmin_user\x18\x05 \x01(\x0b2\x14.eve.user.Identifier\x12\x11\n\treference\x18\x06 \x01(\t\x12*\n\x07context\x18\x07 \x01(\x0b2\x19.eve.quasar.admin.ContextB\x08\n\x06expiry"I\n\x18UpsertWithExpiryResponse\x12-\n\x07license\x18\x01 \x01(\x0b2\x1c.eve.user.license.AttributesBGZEgithub.com/ccpgames/eve-proto-go/generated/eve/user/license/api/adminb\x06proto3', dependencies=[eve_dot_quasar_dot_admin_dot_admin__pb2.DESCRIPTOR, + eve_dot_user_dot_license_dot_license__pb2.DESCRIPTOR, + eve_dot_user_dot_user__pb2.DESCRIPTOR, + google_dot_protobuf_dot_duration__pb2.DESCRIPTOR, + google_dot_protobuf_dot_timestamp__pb2.DESCRIPTOR]) +_UPSERTWITHEXPIRYREQUEST = _descriptor.Descriptor(name='UpsertWithExpiryRequest', full_name='eve.user.license.api.admin.UpsertWithExpiryRequest', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='license', full_name='eve.user.license.api.admin.UpsertWithExpiryRequest.license', 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='expiry_date', full_name='eve.user.license.api.admin.UpsertWithExpiryRequest.expiry_date', 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), + _descriptor.FieldDescriptor(name='add_duration', full_name='eve.user.license.api.admin.UpsertWithExpiryRequest.add_duration', index=2, number=3, 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='expire_now', full_name='eve.user.license.api.admin.UpsertWithExpiryRequest.expire_now', index=3, number=4, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, 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='admin_user', full_name='eve.user.license.api.admin.UpsertWithExpiryRequest.admin_user', index=4, number=5, 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='reference', full_name='eve.user.license.api.admin.UpsertWithExpiryRequest.reference', index=5, number=6, 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), + _descriptor.FieldDescriptor(name='context', full_name='eve.user.license.api.admin.UpsertWithExpiryRequest.context', index=6, number=7, 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=[_descriptor.OneofDescriptor(name='expiry', full_name='eve.user.license.api.admin.UpsertWithExpiryRequest.expiry', index=0, containing_type=None, create_key=_descriptor._internal_create_key, fields=[])], serialized_start=222, serialized_end=533) +_UPSERTWITHEXPIRYRESPONSE = _descriptor.Descriptor(name='UpsertWithExpiryResponse', full_name='eve.user.license.api.admin.UpsertWithExpiryResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='license', full_name='eve.user.license.api.admin.UpsertWithExpiryResponse.license', 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=535, serialized_end=608) +_UPSERTWITHEXPIRYREQUEST.fields_by_name['license'].message_type = eve_dot_user_dot_license_dot_license__pb2._IDENTIFIER +_UPSERTWITHEXPIRYREQUEST.fields_by_name['expiry_date'].message_type = google_dot_protobuf_dot_timestamp__pb2._TIMESTAMP +_UPSERTWITHEXPIRYREQUEST.fields_by_name['add_duration'].message_type = google_dot_protobuf_dot_duration__pb2._DURATION +_UPSERTWITHEXPIRYREQUEST.fields_by_name['admin_user'].message_type = eve_dot_user_dot_user__pb2._IDENTIFIER +_UPSERTWITHEXPIRYREQUEST.fields_by_name['context'].message_type = eve_dot_quasar_dot_admin_dot_admin__pb2._CONTEXT +_UPSERTWITHEXPIRYREQUEST.oneofs_by_name['expiry'].fields.append(_UPSERTWITHEXPIRYREQUEST.fields_by_name['expiry_date']) +_UPSERTWITHEXPIRYREQUEST.fields_by_name['expiry_date'].containing_oneof = _UPSERTWITHEXPIRYREQUEST.oneofs_by_name['expiry'] +_UPSERTWITHEXPIRYREQUEST.oneofs_by_name['expiry'].fields.append(_UPSERTWITHEXPIRYREQUEST.fields_by_name['add_duration']) +_UPSERTWITHEXPIRYREQUEST.fields_by_name['add_duration'].containing_oneof = _UPSERTWITHEXPIRYREQUEST.oneofs_by_name['expiry'] +_UPSERTWITHEXPIRYREQUEST.oneofs_by_name['expiry'].fields.append(_UPSERTWITHEXPIRYREQUEST.fields_by_name['expire_now']) +_UPSERTWITHEXPIRYREQUEST.fields_by_name['expire_now'].containing_oneof = _UPSERTWITHEXPIRYREQUEST.oneofs_by_name['expiry'] +_UPSERTWITHEXPIRYRESPONSE.fields_by_name['license'].message_type = eve_dot_user_dot_license_dot_license__pb2._ATTRIBUTES +DESCRIPTOR.message_types_by_name['UpsertWithExpiryRequest'] = _UPSERTWITHEXPIRYREQUEST +DESCRIPTOR.message_types_by_name['UpsertWithExpiryResponse'] = _UPSERTWITHEXPIRYRESPONSE +_sym_db.RegisterFileDescriptor(DESCRIPTOR) +UpsertWithExpiryRequest = _reflection.GeneratedProtocolMessageType('UpsertWithExpiryRequest', (_message.Message,), {'DESCRIPTOR': _UPSERTWITHEXPIRYREQUEST, + '__module__': 'eve.user.license.api.admin.requests_pb2'}) +_sym_db.RegisterMessage(UpsertWithExpiryRequest) +UpsertWithExpiryResponse = _reflection.GeneratedProtocolMessageType('UpsertWithExpiryResponse', (_message.Message,), {'DESCRIPTOR': _UPSERTWITHEXPIRYRESPONSE, + '__module__': 'eve.user.license.api.admin.requests_pb2'}) +_sym_db.RegisterMessage(UpsertWithExpiryResponse) +DESCRIPTOR._options = None diff --git a/eveProto/generated/eve/user/license/api/requests_pb2.py b/eveProto/generated/eve/user/license/api/requests_pb2.py @@ -4,13 +4,15 @@ from google.protobuf import message as _message 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 import eve_pb2 as eve_dot_eve__pb2 from eveProto.generated.eve.payment import payment_pb2 as eve_dot_payment_dot_payment__pb2 from eveProto.generated.eve.user.license.grant import grant_pb2 as eve_dot_user_dot_license_dot_grant_dot_grant__pb2 from eveProto.generated.eve.user.license import license_pb2 as eve_dot_user_dot_license_dot_license__pb2 from eveProto.generated.eve.user import user_pb2 as eve_dot_user_dot_user__pb2 from google.protobuf import duration_pb2 as google_dot_protobuf_dot_duration__pb2 from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2 -DESCRIPTOR = _descriptor.FileDescriptor(name='eve/user/license/api/requests.proto', package='eve.user.license.api', syntax='proto3', serialized_options='Z?github.com/ccpgames/eve-proto-go/generated/eve/user/license/api', create_key=_descriptor._internal_create_key, serialized_pb='\n#eve/user/license/api/requests.proto\x12\x14eve.user.license.api\x1a\x19eve/payment/payment.proto\x1a"eve/user/license/grant/grant.proto\x1a\x1eeve/user/license/license.proto\x1a\x13eve/user/user.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x1fgoogle/protobuf/timestamp.proto"\x8d\x02\n\x0cGrantRequest\x12-\n\x07license\x18\x01 \x01(\x0b2\x1c.eve.user.license.Identifier\x121\n\x0bexpiry_date\x18\x02 \x01(\x0b2\x1a.google.protobuf.TimestampH\x00\x121\n\x0cadd_duration\x18\x03 \x01(\x0b2\x19.google.protobuf.DurationH\x00\x12+\n\x0epayment_method\x18\x04 \x01(\x0e2\x13.eve.payment.Method\x121\n\x05grant\x18\x05 \x01(\x0b2".eve.user.license.grant.IdentifierB\x08\n\x06expiry"\x0f\n\rGrantResponse"\xca\x01\n\x14SetExpiryDateRequest\x12-\n\x07license\x18\x01 \x01(\x0b2\x1c.eve.user.license.Identifier\x121\n\x0bexpiry_date\x18\x02 \x01(\x0b2\x1a.google.protobuf.TimestampH\x00\x121\n\x0cadd_duration\x18\x03 \x01(\x0b2\x19.google.protobuf.DurationH\x00\x12\x13\n\x0bdescription\x18\x04 \x01(\tB\x08\n\x06expiry"F\n\x15SetExpiryDateResponse\x12-\n\x07license\x18\x01 \x01(\x0b2\x1c.eve.user.license.Attributes":\n\x14GetAllForUserRequest\x12"\n\x04user\x18\x01 \x01(\x0b2\x14.eve.user.Identifier"G\n\x15GetAllForUserResponse\x12.\n\x08licenses\x18\x01 \x03(\x0b2\x1c.eve.user.license.Identifier";\n\nGetRequest\x12-\n\x07license\x18\x01 \x01(\x0b2\x1c.eve.user.license.Identifier"<\n\x0bGetResponse\x12-\n\x07license\x18\x01 \x01(\x0b2\x1c.eve.user.license.AttributesBAZ?github.com/ccpgames/eve-proto-go/generated/eve/user/license/apib\x06proto3', dependencies=[eve_dot_payment_dot_payment__pb2.DESCRIPTOR, +DESCRIPTOR = _descriptor.FileDescriptor(name='eve/user/license/api/requests.proto', package='eve.user.license.api', syntax='proto3', serialized_options='Z?github.com/ccpgames/eve-proto-go/generated/eve/user/license/api', create_key=_descriptor._internal_create_key, serialized_pb='\n#eve/user/license/api/requests.proto\x12\x14eve.user.license.api\x1a\reve/eve.proto\x1a\x19eve/payment/payment.proto\x1a"eve/user/license/grant/grant.proto\x1a\x1eeve/user/license/license.proto\x1a\x13eve/user/user.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x1fgoogle/protobuf/timestamp.proto"\xa2\x02\n\x0cGrantRequest\x12-\n\x07license\x18\x01 \x01(\x0b2\x1c.eve.user.license.Identifier\x121\n\x0bexpiry_date\x18\x02 \x01(\x0b2\x1a.google.protobuf.TimestampH\x00\x121\n\x0cadd_duration\x18\x03 \x01(\x0b2\x19.google.protobuf.DurationH\x00\x12\x13\n\tpermanent\x18\x06 \x01(\x08H\x00\x12+\n\x0epayment_method\x18\x04 \x01(\x0e2\x13.eve.payment.Method\x121\n\x05grant\x18\x05 \x01(\x0b2".eve.user.license.grant.IdentifierB\x08\n\x06expiry"\x0f\n\rGrantResponse"\xca\x01\n\x14SetExpiryDateRequest\x12-\n\x07license\x18\x01 \x01(\x0b2\x1c.eve.user.license.Identifier\x121\n\x0bexpiry_date\x18\x02 \x01(\x0b2\x1a.google.protobuf.TimestampH\x00\x121\n\x0cadd_duration\x18\x03 \x01(\x0b2\x19.google.protobuf.DurationH\x00\x12\x13\n\x0bdescription\x18\x04 \x01(\tB\x08\n\x06expiry"F\n\x15SetExpiryDateResponse\x12-\n\x07license\x18\x01 \x01(\x0b2\x1c.eve.user.license.Attributes":\n\x14GetAllForUserRequest\x12"\n\x04user\x18\x01 \x01(\x0b2\x14.eve.user.Identifier"G\n\x15GetAllForUserResponse\x12.\n\x08licenses\x18\x01 \x03(\x0b2\x1c.eve.user.license.Identifier";\n\nGetRequest\x12-\n\x07license\x18\x01 \x01(\x0b2\x1c.eve.user.license.Identifier"<\n\x0bGetResponse\x12-\n\x07license\x18\x01 \x01(\x0b2\x1c.eve.user.license.Attributes"\x98\x02\n\x15GetAllByExpiryRequest\x123\n\rexpires_after\x18\x01 \x01(\x0b2\x1a.google.protobuf.TimestampH\x00\x12\x1a\n\x10no_expires_after\x18\x02 \x01(\x08H\x00\x124\n\x0eexpires_before\x18\x03 \x01(\x0b2\x1a.google.protobuf.TimestampH\x01\x12\x1b\n\x11no_expires_before\x18\x04 \x01(\x08H\x01\x12\x14\n\x0clicense_type\x18\x05 \x01(\t\x12\x17\n\x04page\x18\x06 \x01(\x0b2\t.eve.PageB\x16\n\x14optional_range_startB\x14\n\x12optional_range_end"\xee\x01\n\x16GetAllByExpiryResponse\x12F\n\x08licenses\x18\x01 \x03(\x0b24.eve.user.license.api.GetAllByExpiryResponse.License\x12 \n\tnext_page\x18\x02 \x01(\x0b2\r.eve.NextPage\x1aj\n\x07License\x12-\n\x07license\x18\x01 \x01(\x0b2\x1c.eve.user.license.Identifier\x120\n\nattributes\x18\x02 \x01(\x0b2\x1c.eve.user.license.AttributesBAZ?github.com/ccpgames/eve-proto-go/generated/eve/user/license/apib\x06proto3', dependencies=[eve_dot_eve__pb2.DESCRIPTOR, + eve_dot_payment_dot_payment__pb2.DESCRIPTOR, eve_dot_user_dot_license_dot_grant_dot_grant__pb2.DESCRIPTOR, eve_dot_user_dot_license_dot_license__pb2.DESCRIPTOR, eve_dot_user_dot_user__pb2.DESCRIPTOR, @@ -19,18 +21,27 @@ DESCRIPTOR = _descriptor.FileDescriptor(name='eve/user/license/api/requests.prot _GRANTREQUEST = _descriptor.Descriptor(name='GrantRequest', full_name='eve.user.license.api.GrantRequest', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='license', full_name='eve.user.license.api.GrantRequest.license', 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='expiry_date', full_name='eve.user.license.api.GrantRequest.expiry_date', 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), _descriptor.FieldDescriptor(name='add_duration', full_name='eve.user.license.api.GrantRequest.add_duration', index=2, number=3, 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='payment_method', full_name='eve.user.license.api.GrantRequest.payment_method', index=3, number=4, type=14, cpp_type=8, label=1, has_default_value=False, default_value=0, 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='grant', full_name='eve.user.license.api.GrantRequest.grant', index=4, number=5, 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=[_descriptor.OneofDescriptor(name='expiry', full_name='eve.user.license.api.GrantRequest.expiry', index=0, containing_type=None, create_key=_descriptor._internal_create_key, fields=[])], serialized_start=243, serialized_end=512) -_GRANTRESPONSE = _descriptor.Descriptor(name='GrantResponse', full_name='eve.user.license.api.GrantResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=514, serialized_end=529) + _descriptor.FieldDescriptor(name='permanent', full_name='eve.user.license.api.GrantRequest.permanent', index=3, number=6, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, 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='payment_method', full_name='eve.user.license.api.GrantRequest.payment_method', index=4, number=4, type=14, cpp_type=8, label=1, has_default_value=False, default_value=0, 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='grant', full_name='eve.user.license.api.GrantRequest.grant', index=5, number=5, 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=[_descriptor.OneofDescriptor(name='expiry', full_name='eve.user.license.api.GrantRequest.expiry', index=0, containing_type=None, create_key=_descriptor._internal_create_key, fields=[])], serialized_start=258, serialized_end=548) +_GRANTRESPONSE = _descriptor.Descriptor(name='GrantResponse', full_name='eve.user.license.api.GrantResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=550, serialized_end=565) _SETEXPIRYDATEREQUEST = _descriptor.Descriptor(name='SetExpiryDateRequest', full_name='eve.user.license.api.SetExpiryDateRequest', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='license', full_name='eve.user.license.api.SetExpiryDateRequest.license', 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='expiry_date', full_name='eve.user.license.api.SetExpiryDateRequest.expiry_date', 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), _descriptor.FieldDescriptor(name='add_duration', full_name='eve.user.license.api.SetExpiryDateRequest.add_duration', index=2, number=3, 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='description', full_name='eve.user.license.api.SetExpiryDateRequest.description', index=3, number=4, 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=[_descriptor.OneofDescriptor(name='expiry', full_name='eve.user.license.api.SetExpiryDateRequest.expiry', index=0, containing_type=None, create_key=_descriptor._internal_create_key, fields=[])], serialized_start=532, serialized_end=734) -_SETEXPIRYDATERESPONSE = _descriptor.Descriptor(name='SetExpiryDateResponse', full_name='eve.user.license.api.SetExpiryDateResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='license', full_name='eve.user.license.api.SetExpiryDateResponse.license', 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=736, serialized_end=806) -_GETALLFORUSERREQUEST = _descriptor.Descriptor(name='GetAllForUserRequest', full_name='eve.user.license.api.GetAllForUserRequest', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='user', full_name='eve.user.license.api.GetAllForUserRequest.user', 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=808, serialized_end=866) -_GETALLFORUSERRESPONSE = _descriptor.Descriptor(name='GetAllForUserResponse', full_name='eve.user.license.api.GetAllForUserResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='licenses', full_name='eve.user.license.api.GetAllForUserResponse.licenses', index=0, number=1, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], 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=868, serialized_end=939) -_GETREQUEST = _descriptor.Descriptor(name='GetRequest', full_name='eve.user.license.api.GetRequest', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='license', full_name='eve.user.license.api.GetRequest.license', 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=941, serialized_end=1000) -_GETRESPONSE = _descriptor.Descriptor(name='GetResponse', full_name='eve.user.license.api.GetResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='license', full_name='eve.user.license.api.GetResponse.license', 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=1002, serialized_end=1062) + _descriptor.FieldDescriptor(name='description', full_name='eve.user.license.api.SetExpiryDateRequest.description', index=3, number=4, 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=[_descriptor.OneofDescriptor(name='expiry', full_name='eve.user.license.api.SetExpiryDateRequest.expiry', index=0, containing_type=None, create_key=_descriptor._internal_create_key, fields=[])], serialized_start=568, serialized_end=770) +_SETEXPIRYDATERESPONSE = _descriptor.Descriptor(name='SetExpiryDateResponse', full_name='eve.user.license.api.SetExpiryDateResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='license', full_name='eve.user.license.api.SetExpiryDateResponse.license', 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=772, serialized_end=842) +_GETALLFORUSERREQUEST = _descriptor.Descriptor(name='GetAllForUserRequest', full_name='eve.user.license.api.GetAllForUserRequest', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='user', full_name='eve.user.license.api.GetAllForUserRequest.user', 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=844, serialized_end=902) +_GETALLFORUSERRESPONSE = _descriptor.Descriptor(name='GetAllForUserResponse', full_name='eve.user.license.api.GetAllForUserResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='licenses', full_name='eve.user.license.api.GetAllForUserResponse.licenses', index=0, number=1, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], 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=904, serialized_end=975) +_GETREQUEST = _descriptor.Descriptor(name='GetRequest', full_name='eve.user.license.api.GetRequest', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='license', full_name='eve.user.license.api.GetRequest.license', 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=977, serialized_end=1036) +_GETRESPONSE = _descriptor.Descriptor(name='GetResponse', full_name='eve.user.license.api.GetResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='license', full_name='eve.user.license.api.GetResponse.license', 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=1038, serialized_end=1098) +_GETALLBYEXPIRYREQUEST = _descriptor.Descriptor(name='GetAllByExpiryRequest', full_name='eve.user.license.api.GetAllByExpiryRequest', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='expires_after', full_name='eve.user.license.api.GetAllByExpiryRequest.expires_after', 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='no_expires_after', full_name='eve.user.license.api.GetAllByExpiryRequest.no_expires_after', index=1, number=2, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, 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='expires_before', full_name='eve.user.license.api.GetAllByExpiryRequest.expires_before', index=2, number=3, 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='no_expires_before', full_name='eve.user.license.api.GetAllByExpiryRequest.no_expires_before', index=3, number=4, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, 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='license_type', full_name='eve.user.license.api.GetAllByExpiryRequest.license_type', index=4, number=5, 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), + _descriptor.FieldDescriptor(name='page', full_name='eve.user.license.api.GetAllByExpiryRequest.page', index=5, number=6, 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=[_descriptor.OneofDescriptor(name='optional_range_start', full_name='eve.user.license.api.GetAllByExpiryRequest.optional_range_start', index=0, containing_type=None, create_key=_descriptor._internal_create_key, fields=[]), _descriptor.OneofDescriptor(name='optional_range_end', full_name='eve.user.license.api.GetAllByExpiryRequest.optional_range_end', index=1, containing_type=None, create_key=_descriptor._internal_create_key, fields=[])], serialized_start=1101, serialized_end=1381) +_GETALLBYEXPIRYRESPONSE_LICENSE = _descriptor.Descriptor(name='License', full_name='eve.user.license.api.GetAllByExpiryResponse.License', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='license', full_name='eve.user.license.api.GetAllByExpiryResponse.License.license', 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='attributes', full_name='eve.user.license.api.GetAllByExpiryResponse.License.attributes', 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=1516, serialized_end=1622) +_GETALLBYEXPIRYRESPONSE = _descriptor.Descriptor(name='GetAllByExpiryResponse', full_name='eve.user.license.api.GetAllByExpiryResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='licenses', full_name='eve.user.license.api.GetAllByExpiryResponse.licenses', index=0, number=1, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], 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='next_page', full_name='eve.user.license.api.GetAllByExpiryResponse.next_page', 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=[_GETALLBYEXPIRYRESPONSE_LICENSE], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=1384, serialized_end=1622) _GRANTREQUEST.fields_by_name['license'].message_type = eve_dot_user_dot_license_dot_license__pb2._IDENTIFIER _GRANTREQUEST.fields_by_name['expiry_date'].message_type = google_dot_protobuf_dot_timestamp__pb2._TIMESTAMP _GRANTREQUEST.fields_by_name['add_duration'].message_type = google_dot_protobuf_dot_duration__pb2._DURATION @@ -40,6 +51,8 @@ _GRANTREQUEST.oneofs_by_name['expiry'].fields.append(_GRANTREQUEST.fields_by_nam _GRANTREQUEST.fields_by_name['expiry_date'].containing_oneof = _GRANTREQUEST.oneofs_by_name['expiry'] _GRANTREQUEST.oneofs_by_name['expiry'].fields.append(_GRANTREQUEST.fields_by_name['add_duration']) _GRANTREQUEST.fields_by_name['add_duration'].containing_oneof = _GRANTREQUEST.oneofs_by_name['expiry'] +_GRANTREQUEST.oneofs_by_name['expiry'].fields.append(_GRANTREQUEST.fields_by_name['permanent']) +_GRANTREQUEST.fields_by_name['permanent'].containing_oneof = _GRANTREQUEST.oneofs_by_name['expiry'] _SETEXPIRYDATEREQUEST.fields_by_name['license'].message_type = eve_dot_user_dot_license_dot_license__pb2._IDENTIFIER _SETEXPIRYDATEREQUEST.fields_by_name['expiry_date'].message_type = google_dot_protobuf_dot_timestamp__pb2._TIMESTAMP _SETEXPIRYDATEREQUEST.fields_by_name['add_duration'].message_type = google_dot_protobuf_dot_duration__pb2._DURATION @@ -52,6 +65,22 @@ _GETALLFORUSERREQUEST.fields_by_name['user'].message_type = eve_dot_user_dot_use _GETALLFORUSERRESPONSE.fields_by_name['licenses'].message_type = eve_dot_user_dot_license_dot_license__pb2._IDENTIFIER _GETREQUEST.fields_by_name['license'].message_type = eve_dot_user_dot_license_dot_license__pb2._IDENTIFIER _GETRESPONSE.fields_by_name['license'].message_type = eve_dot_user_dot_license_dot_license__pb2._ATTRIBUTES +_GETALLBYEXPIRYREQUEST.fields_by_name['expires_after'].message_type = google_dot_protobuf_dot_timestamp__pb2._TIMESTAMP +_GETALLBYEXPIRYREQUEST.fields_by_name['expires_before'].message_type = google_dot_protobuf_dot_timestamp__pb2._TIMESTAMP +_GETALLBYEXPIRYREQUEST.fields_by_name['page'].message_type = eve_dot_eve__pb2._PAGE +_GETALLBYEXPIRYREQUEST.oneofs_by_name['optional_range_start'].fields.append(_GETALLBYEXPIRYREQUEST.fields_by_name['expires_after']) +_GETALLBYEXPIRYREQUEST.fields_by_name['expires_after'].containing_oneof = _GETALLBYEXPIRYREQUEST.oneofs_by_name['optional_range_start'] +_GETALLBYEXPIRYREQUEST.oneofs_by_name['optional_range_start'].fields.append(_GETALLBYEXPIRYREQUEST.fields_by_name['no_expires_after']) +_GETALLBYEXPIRYREQUEST.fields_by_name['no_expires_after'].containing_oneof = _GETALLBYEXPIRYREQUEST.oneofs_by_name['optional_range_start'] +_GETALLBYEXPIRYREQUEST.oneofs_by_name['optional_range_end'].fields.append(_GETALLBYEXPIRYREQUEST.fields_by_name['expires_before']) +_GETALLBYEXPIRYREQUEST.fields_by_name['expires_before'].containing_oneof = _GETALLBYEXPIRYREQUEST.oneofs_by_name['optional_range_end'] +_GETALLBYEXPIRYREQUEST.oneofs_by_name['optional_range_end'].fields.append(_GETALLBYEXPIRYREQUEST.fields_by_name['no_expires_before']) +_GETALLBYEXPIRYREQUEST.fields_by_name['no_expires_before'].containing_oneof = _GETALLBYEXPIRYREQUEST.oneofs_by_name['optional_range_end'] +_GETALLBYEXPIRYRESPONSE_LICENSE.fields_by_name['license'].message_type = eve_dot_user_dot_license_dot_license__pb2._IDENTIFIER +_GETALLBYEXPIRYRESPONSE_LICENSE.fields_by_name['attributes'].message_type = eve_dot_user_dot_license_dot_license__pb2._ATTRIBUTES +_GETALLBYEXPIRYRESPONSE_LICENSE.containing_type = _GETALLBYEXPIRYRESPONSE +_GETALLBYEXPIRYRESPONSE.fields_by_name['licenses'].message_type = _GETALLBYEXPIRYRESPONSE_LICENSE +_GETALLBYEXPIRYRESPONSE.fields_by_name['next_page'].message_type = eve_dot_eve__pb2._NEXTPAGE DESCRIPTOR.message_types_by_name['GrantRequest'] = _GRANTREQUEST DESCRIPTOR.message_types_by_name['GrantResponse'] = _GRANTRESPONSE DESCRIPTOR.message_types_by_name['SetExpiryDateRequest'] = _SETEXPIRYDATEREQUEST @@ -60,6 +89,8 @@ DESCRIPTOR.message_types_by_name['GetAllForUserRequest'] = _GETALLFORUSERREQUEST DESCRIPTOR.message_types_by_name['GetAllForUserResponse'] = _GETALLFORUSERRESPONSE DESCRIPTOR.message_types_by_name['GetRequest'] = _GETREQUEST DESCRIPTOR.message_types_by_name['GetResponse'] = _GETRESPONSE +DESCRIPTOR.message_types_by_name['GetAllByExpiryRequest'] = _GETALLBYEXPIRYREQUEST +DESCRIPTOR.message_types_by_name['GetAllByExpiryResponse'] = _GETALLBYEXPIRYRESPONSE _sym_db.RegisterFileDescriptor(DESCRIPTOR) GrantRequest = _reflection.GeneratedProtocolMessageType('GrantRequest', (_message.Message,), {'DESCRIPTOR': _GRANTREQUEST, '__module__': 'eve.user.license.api.requests_pb2'}) @@ -85,4 +116,13 @@ _sym_db.RegisterMessage(GetRequest) GetResponse = _reflection.GeneratedProtocolMessageType('GetResponse', (_message.Message,), {'DESCRIPTOR': _GETRESPONSE, '__module__': 'eve.user.license.api.requests_pb2'}) _sym_db.RegisterMessage(GetResponse) +GetAllByExpiryRequest = _reflection.GeneratedProtocolMessageType('GetAllByExpiryRequest', (_message.Message,), {'DESCRIPTOR': _GETALLBYEXPIRYREQUEST, + '__module__': 'eve.user.license.api.requests_pb2'}) +_sym_db.RegisterMessage(GetAllByExpiryRequest) +GetAllByExpiryResponse = _reflection.GeneratedProtocolMessageType('GetAllByExpiryResponse', (_message.Message,), {'License': _reflection.GeneratedProtocolMessageType('License', (_message.Message,), {'DESCRIPTOR': _GETALLBYEXPIRYRESPONSE_LICENSE, + '__module__': 'eve.user.license.api.requests_pb2'}), + 'DESCRIPTOR': _GETALLBYEXPIRYRESPONSE, + '__module__': 'eve.user.license.api.requests_pb2'}) +_sym_db.RegisterMessage(GetAllByExpiryResponse) +_sym_db.RegisterMessage(GetAllByExpiryResponse.License) DESCRIPTOR._options = None diff --git a/eveProto/generated/eve/vanguard/commission/assignment/api/events_pb2.py b/eveProto/generated/eve/vanguard/commission/assignment/api/events_pb2.py @@ -4,12 +4,17 @@ from google.protobuf import message as _message 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.faction import faction_pb2 as eve_dot_faction_dot_faction__pb2 from eveProto.generated.eve.user import user_pb2 as eve_dot_user_dot_user__pb2 from eveProto.generated.eve.vanguard.commission.assignment import assignment_pb2 as eve_dot_vanguard_dot_commission_dot_assignment_dot_assignment__pb2 -DESCRIPTOR = _descriptor.FileDescriptor(name='eve/vanguard/commission/assignment/api/events.proto', package='eve.vanguard.commission.assignment.api', syntax='proto3', serialized_options='ZQgithub.com/ccpgames/eve-proto-go/generated/eve/vanguard/commission/assignment/api', create_key=_descriptor._internal_create_key, serialized_pb='\n3eve/vanguard/commission/assignment/api/events.proto\x12&eve.vanguard.commission.assignment.api\x1a\x13eve/user/user.proto\x1a3eve/vanguard/commission/assignment/assignment.proto"\x8c\x01\n\tCompleted\x12"\n\x04user\x18\x01 \x01(\x0b2\x14.eve.user.Identifier\x12B\n\nassignment\x18\x02 \x01(\x0b2..eve.vanguard.commission.assignment.Identifier\x12\x17\n\x0fcommission_type\x18\x03 \x01(\tBSZQgithub.com/ccpgames/eve-proto-go/generated/eve/vanguard/commission/assignment/apib\x06proto3', dependencies=[eve_dot_user_dot_user__pb2.DESCRIPTOR, eve_dot_vanguard_dot_commission_dot_assignment_dot_assignment__pb2.DESCRIPTOR]) -_COMPLETED = _descriptor.Descriptor(name='Completed', full_name='eve.vanguard.commission.assignment.api.Completed', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='user', full_name='eve.vanguard.commission.assignment.api.Completed.user', 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='assignment', full_name='eve.vanguard.commission.assignment.api.Completed.assignment', 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), _descriptor.FieldDescriptor(name='commission_type', full_name='eve.vanguard.commission.assignment.api.Completed.commission_type', index=2, number=3, 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=170, serialized_end=310) +DESCRIPTOR = _descriptor.FileDescriptor(name='eve/vanguard/commission/assignment/api/events.proto', package='eve.vanguard.commission.assignment.api', syntax='proto3', serialized_options='ZQgithub.com/ccpgames/eve-proto-go/generated/eve/vanguard/commission/assignment/api', create_key=_descriptor._internal_create_key, serialized_pb='\n3eve/vanguard/commission/assignment/api/events.proto\x12&eve.vanguard.commission.assignment.api\x1a\x19eve/faction/faction.proto\x1a\x13eve/user/user.proto\x1a3eve/vanguard/commission/assignment/assignment.proto"\xbf\x01\n\tCompleted\x12"\n\x04user\x18\x01 \x01(\x0b2\x14.eve.user.Identifier\x12B\n\nassignment\x18\x02 \x01(\x0b2..eve.vanguard.commission.assignment.Identifier\x12\x17\n\x0fcommission_type\x18\x03 \x01(\t\x121\n\x10enlisted_faction\x18\x04 \x01(\x0b2\x17.eve.faction.IdentifierBSZQgithub.com/ccpgames/eve-proto-go/generated/eve/vanguard/commission/assignment/apib\x06proto3', dependencies=[eve_dot_faction_dot_faction__pb2.DESCRIPTOR, eve_dot_user_dot_user__pb2.DESCRIPTOR, eve_dot_vanguard_dot_commission_dot_assignment_dot_assignment__pb2.DESCRIPTOR]) +_COMPLETED = _descriptor.Descriptor(name='Completed', full_name='eve.vanguard.commission.assignment.api.Completed', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='user', full_name='eve.vanguard.commission.assignment.api.Completed.user', 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='assignment', full_name='eve.vanguard.commission.assignment.api.Completed.assignment', 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), + _descriptor.FieldDescriptor(name='commission_type', full_name='eve.vanguard.commission.assignment.api.Completed.commission_type', index=2, number=3, 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), + _descriptor.FieldDescriptor(name='enlisted_faction', full_name='eve.vanguard.commission.assignment.api.Completed.enlisted_faction', index=3, number=4, 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=197, serialized_end=388) _COMPLETED.fields_by_name['user'].message_type = eve_dot_user_dot_user__pb2._IDENTIFIER _COMPLETED.fields_by_name['assignment'].message_type = eve_dot_vanguard_dot_commission_dot_assignment_dot_assignment__pb2._IDENTIFIER +_COMPLETED.fields_by_name['enlisted_faction'].message_type = eve_dot_faction_dot_faction__pb2._IDENTIFIER DESCRIPTOR.message_types_by_name['Completed'] = _COMPLETED _sym_db.RegisterFileDescriptor(DESCRIPTOR) Completed = _reflection.GeneratedProtocolMessageType('Completed', (_message.Message,), {'DESCRIPTOR': _COMPLETED, diff --git a/eveProto/generated/eve_public/campaign/objective/api/requests_pb2.py b/eveProto/generated/eve_public/campaign/objective/api/requests_pb2.py @@ -7,28 +7,28 @@ _sym_db = _symbol_database.Default() from eveProto.generated.eve_public.campaign import campaign_pb2 as eve__public_dot_campaign_dot_campaign__pb2 from eveProto.generated.eve_public.campaign.objective import objective_pb2 as eve__public_dot_campaign_dot_objective_dot_objective__pb2 from eveProto.generated.eve_public.campaign.track import track_pb2 as eve__public_dot_campaign_dot_track_dot_track__pb2 -DESCRIPTOR = _descriptor.FileDescriptor(name='eve_public/campaign/objective/api/requests.proto', package='eve_public.campaign.objective.api', syntax='proto3', serialized_options='ZLgithub.com/ccpgames/eve-proto-go/generated/eve_public/campaign/objective/api', create_key=_descriptor._internal_create_key, serialized_pb='\n0eve_public/campaign/objective/api/requests.proto\x12!eve_public.campaign.objective.api\x1a"eve_public/campaign/campaign.proto\x1a-eve_public/campaign/objective/objective.proto\x1a%eve_public/campaign/track/track.proto"\xa4\x01\n\nGetRequest\x12<\n\tobjective\x18\x01 \x01(\x0b2).eve_public.campaign.objective.Identifier\x12\x14\n\nno_version\x18\x02 \x01(\x08H\x00\x12/\n\x07version\x18\x03 \x01(\x0b2\x1c.eve_public.campaign.VersionH\x00B\x11\n\x0fcurrent_version"\x89\x02\n\x0bGetResponse\x12=\n\nattributes\x18\x01 \x01(\x0b2).eve_public.campaign.objective.Attributes\x12D\n\x06tracks\x18\x02 \x03(\x0b24.eve_public.campaign.objective.api.GetResponse.Track\x1au\n\x05Track\x121\n\x02id\x18\x01 \x01(\x0b2%.eve_public.campaign.track.Identifier\x129\n\nattributes\x18\x02 \x01(\x0b2%.eve_public.campaign.track.Attributes"P\n\x10GetStatusRequest\x12<\n\tobjective\x18\x01 \x01(\x0b2).eve_public.campaign.objective.Identifier"\xfa\x02\n\x11GetStatusResponse\x12<\n\x05state\x18\x01 \x01(\x0b2-.eve_public.campaign.objective.LifecycleState\x123\n\x05stats\x18\x02 \x01(\x0b2$.eve_public.campaign.objective.Stats\x12J\n\x06tracks\x18\x03 \x03(\x0b2:.eve_public.campaign.objective.api.GetStatusResponse.Track\x1a\xa5\x01\n\x05Track\x121\n\x02id\x18\x01 \x01(\x0b2%.eve_public.campaign.track.Identifier\x128\n\x05state\x18\x02 \x01(\x0b2).eve_public.campaign.track.LifecycleState\x12/\n\x05stats\x18\x03 \x01(\x0b2 .eve_public.campaign.track.Stats"[\n\x1bGetParticipantStatusRequest\x12<\n\tobjective\x18\x01 \x01(\x0b2).eve_public.campaign.objective.Identifier"\xe0\x02\n\x1cGetParticipantStatusResponse\x12J\n\x10commitment_state\x18\x01 \x01(\x0e2..eve_public.campaign.objective.CommitmentStateH\x00\x12\x17\n\rno_commitment\x18\x03 \x01(\x08H\x00\x12U\n\x06tracks\x18\x02 \x03(\x0b2E.eve_public.campaign.objective.api.GetParticipantStatusResponse.Track\x1av\n\x05Track\x121\n\x02id\x18\x01 \x01(\x0b2%.eve_public.campaign.track.Identifier\x12:\n\x05stats\x18\x02 \x01(\x0b2+.eve_public.campaign.track.ParticipantStatsB\x0c\n\ncommitment"M\n\rCommitRequest\x12<\n\tobjective\x18\x01 \x01(\x0b2).eve_public.campaign.objective.Identifier"\x10\n\x0eCommitResponse"M\n\rResignRequest\x12<\n\tobjective\x18\x01 \x01(\x0b2).eve_public.campaign.objective.Identifier"\x10\n\x0eResignResponse"X\n\x14RedeemRewardsRequest\x12<\n\tobjective\x18\x01 \x01(\x0b2).eve_public.campaign.objective.Identifier:\x02\x18\x01"\x1b\n\x15RedeemRewardsResponse:\x02\x18\x01"S\n\x0fGetStatsRequest\x12<\n\tobjective\x18\x01 \x03(\x0b2).eve_public.campaign.objective.Identifier:\x02\x18\x01"\xf9\x01\n\x10GetStatsResponse\x12[\n\x0fobjective_stats\x18\x01 \x03(\x0b2B.eve_public.campaign.objective.api.GetStatsResponse.ObjectiveStats\x1a\x83\x01\n\x0eObjectiveStats\x12<\n\tobjective\x18\x01 \x01(\x0b2).eve_public.campaign.objective.Identifier\x123\n\x05stats\x18\x02 \x01(\x0b2$.eve_public.campaign.objective.Stats:\x02\x18\x01"^\n\x1aGetParticipantStatsRequest\x12<\n\tobjective\x18\x01 \x03(\x0b2).eve_public.campaign.objective.Identifier:\x02\x18\x01"\xd5\x02\n\x1bGetParticipantStatsResponse\x12j\n\x11participant_stats\x18\x01 \x03(\x0b2O.eve_public.campaign.objective.api.GetParticipantStatsResponse.ParticipantStats\x1a\xc5\x01\n\x10ParticipantStats\x12<\n\tobjective\x18\x01 \x01(\x0b2).eve_public.campaign.objective.Identifier\x12@\n\x05stats\x18\x02 \x01(\x0b2/.eve_public.campaign.objective.ParticipantStatsH\x00\x12\x1a\n\x10no_participation\x18\x03 \x01(\x08H\x00B\x15\n\x13participation_stats:\x02\x18\x01BNZLgithub.com/ccpgames/eve-proto-go/generated/eve_public/campaign/objective/apib\x06proto3', dependencies=[eve__public_dot_campaign_dot_campaign__pb2.DESCRIPTOR, eve__public_dot_campaign_dot_objective_dot_objective__pb2.DESCRIPTOR, eve__public_dot_campaign_dot_track_dot_track__pb2.DESCRIPTOR]) +DESCRIPTOR = _descriptor.FileDescriptor(name='eve_public/campaign/objective/api/requests.proto', package='eve_public.campaign.objective.api', syntax='proto3', serialized_options='ZLgithub.com/ccpgames/eve-proto-go/generated/eve_public/campaign/objective/api', create_key=_descriptor._internal_create_key, serialized_pb='\n0eve_public/campaign/objective/api/requests.proto\x12!eve_public.campaign.objective.api\x1a"eve_public/campaign/campaign.proto\x1a-eve_public/campaign/objective/objective.proto\x1a%eve_public/campaign/track/track.proto"\xa4\x01\n\nGetRequest\x12<\n\tobjective\x18\x01 \x01(\x0b2).eve_public.campaign.objective.Identifier\x12\x14\n\nno_version\x18\x02 \x01(\x08H\x00\x12/\n\x07version\x18\x03 \x01(\x0b2\x1c.eve_public.campaign.VersionH\x00B\x11\n\x0fcurrent_version"\xb8\x02\n\x0bGetResponse\x12=\n\nattributes\x18\x01 \x01(\x0b2).eve_public.campaign.objective.Attributes\x12D\n\x06tracks\x18\x02 \x03(\x0b24.eve_public.campaign.objective.api.GetResponse.Track\x12-\n\x07version\x18\x03 \x01(\x0b2\x1c.eve_public.campaign.Version\x1au\n\x05Track\x121\n\x02id\x18\x01 \x01(\x0b2%.eve_public.campaign.track.Identifier\x129\n\nattributes\x18\x02 \x01(\x0b2%.eve_public.campaign.track.Attributes"P\n\x10GetStatusRequest\x12<\n\tobjective\x18\x01 \x01(\x0b2).eve_public.campaign.objective.Identifier"\xfa\x02\n\x11GetStatusResponse\x12<\n\x05state\x18\x01 \x01(\x0b2-.eve_public.campaign.objective.LifecycleState\x123\n\x05stats\x18\x02 \x01(\x0b2$.eve_public.campaign.objective.Stats\x12J\n\x06tracks\x18\x03 \x03(\x0b2:.eve_public.campaign.objective.api.GetStatusResponse.Track\x1a\xa5\x01\n\x05Track\x121\n\x02id\x18\x01 \x01(\x0b2%.eve_public.campaign.track.Identifier\x128\n\x05state\x18\x02 \x01(\x0b2).eve_public.campaign.track.LifecycleState\x12/\n\x05stats\x18\x03 \x01(\x0b2 .eve_public.campaign.track.Stats"[\n\x1bGetParticipantStatusRequest\x12<\n\tobjective\x18\x01 \x01(\x0b2).eve_public.campaign.objective.Identifier"\xe0\x02\n\x1cGetParticipantStatusResponse\x12J\n\x10commitment_state\x18\x01 \x01(\x0e2..eve_public.campaign.objective.CommitmentStateH\x00\x12\x17\n\rno_commitment\x18\x03 \x01(\x08H\x00\x12U\n\x06tracks\x18\x02 \x03(\x0b2E.eve_public.campaign.objective.api.GetParticipantStatusResponse.Track\x1av\n\x05Track\x121\n\x02id\x18\x01 \x01(\x0b2%.eve_public.campaign.track.Identifier\x12:\n\x05stats\x18\x02 \x01(\x0b2+.eve_public.campaign.track.ParticipantStatsB\x0c\n\ncommitment"M\n\rCommitRequest\x12<\n\tobjective\x18\x01 \x01(\x0b2).eve_public.campaign.objective.Identifier"\x10\n\x0eCommitResponse"M\n\rResignRequest\x12<\n\tobjective\x18\x01 \x01(\x0b2).eve_public.campaign.objective.Identifier"\x10\n\x0eResignResponse"X\n\x14RedeemRewardsRequest\x12<\n\tobjective\x18\x01 \x01(\x0b2).eve_public.campaign.objective.Identifier:\x02\x18\x01"\x1b\n\x15RedeemRewardsResponse:\x02\x18\x01"S\n\x0fGetStatsRequest\x12<\n\tobjective\x18\x01 \x03(\x0b2).eve_public.campaign.objective.Identifier:\x02\x18\x01"\xf9\x01\n\x10GetStatsResponse\x12[\n\x0fobjective_stats\x18\x01 \x03(\x0b2B.eve_public.campaign.objective.api.GetStatsResponse.ObjectiveStats\x1a\x83\x01\n\x0eObjectiveStats\x12<\n\tobjective\x18\x01 \x01(\x0b2).eve_public.campaign.objective.Identifier\x123\n\x05stats\x18\x02 \x01(\x0b2$.eve_public.campaign.objective.Stats:\x02\x18\x01"^\n\x1aGetParticipantStatsRequest\x12<\n\tobjective\x18\x01 \x03(\x0b2).eve_public.campaign.objective.Identifier:\x02\x18\x01"\xd5\x02\n\x1bGetParticipantStatsResponse\x12j\n\x11participant_stats\x18\x01 \x03(\x0b2O.eve_public.campaign.objective.api.GetParticipantStatsResponse.ParticipantStats\x1a\xc5\x01\n\x10ParticipantStats\x12<\n\tobjective\x18\x01 \x01(\x0b2).eve_public.campaign.objective.Identifier\x12@\n\x05stats\x18\x02 \x01(\x0b2/.eve_public.campaign.objective.ParticipantStatsH\x00\x12\x1a\n\x10no_participation\x18\x03 \x01(\x08H\x00B\x15\n\x13participation_stats:\x02\x18\x01BNZLgithub.com/ccpgames/eve-proto-go/generated/eve_public/campaign/objective/apib\x06proto3', dependencies=[eve__public_dot_campaign_dot_campaign__pb2.DESCRIPTOR, eve__public_dot_campaign_dot_objective_dot_objective__pb2.DESCRIPTOR, eve__public_dot_campaign_dot_track_dot_track__pb2.DESCRIPTOR]) _GETREQUEST = _descriptor.Descriptor(name='GetRequest', full_name='eve_public.campaign.objective.api.GetRequest', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='objective', full_name='eve_public.campaign.objective.api.GetRequest.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='no_version', full_name='eve_public.campaign.objective.api.GetRequest.no_version', index=1, number=2, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, 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='version', full_name='eve_public.campaign.objective.api.GetRequest.version', index=2, number=3, 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=[_descriptor.OneofDescriptor(name='current_version', full_name='eve_public.campaign.objective.api.GetRequest.current_version', index=0, containing_type=None, create_key=_descriptor._internal_create_key, fields=[])], serialized_start=210, serialized_end=374) -_GETRESPONSE_TRACK = _descriptor.Descriptor(name='Track', full_name='eve_public.campaign.objective.api.GetResponse.Track', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='id', full_name='eve_public.campaign.objective.api.GetResponse.Track.id', 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='attributes', full_name='eve_public.campaign.objective.api.GetResponse.Track.attributes', 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=525, serialized_end=642) -_GETRESPONSE = _descriptor.Descriptor(name='GetResponse', full_name='eve_public.campaign.objective.api.GetResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='attributes', full_name='eve_public.campaign.objective.api.GetResponse.attributes', 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='tracks', full_name='eve_public.campaign.objective.api.GetResponse.tracks', index=1, number=2, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], 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=[_GETRESPONSE_TRACK], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=377, serialized_end=642) -_GETSTATUSREQUEST = _descriptor.Descriptor(name='GetStatusRequest', full_name='eve_public.campaign.objective.api.GetStatusRequest', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='objective', full_name='eve_public.campaign.objective.api.GetStatusRequest.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=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=644, serialized_end=724) -_GETSTATUSRESPONSE_TRACK = _descriptor.Descriptor(name='Track', full_name='eve_public.campaign.objective.api.GetStatusResponse.Track', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='id', full_name='eve_public.campaign.objective.api.GetStatusResponse.Track.id', 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='state', full_name='eve_public.campaign.objective.api.GetStatusResponse.Track.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), _descriptor.FieldDescriptor(name='stats', full_name='eve_public.campaign.objective.api.GetStatusResponse.Track.stats', index=2, number=3, 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=940, serialized_end=1105) -_GETSTATUSRESPONSE = _descriptor.Descriptor(name='GetStatusResponse', full_name='eve_public.campaign.objective.api.GetStatusResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='state', full_name='eve_public.campaign.objective.api.GetStatusResponse.state', 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='stats', full_name='eve_public.campaign.objective.api.GetStatusResponse.stats', 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), _descriptor.FieldDescriptor(name='tracks', full_name='eve_public.campaign.objective.api.GetStatusResponse.tracks', index=2, number=3, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], 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=[_GETSTATUSRESPONSE_TRACK], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=727, serialized_end=1105) -_GETPARTICIPANTSTATUSREQUEST = _descriptor.Descriptor(name='GetParticipantStatusRequest', full_name='eve_public.campaign.objective.api.GetParticipantStatusRequest', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='objective', full_name='eve_public.campaign.objective.api.GetParticipantStatusRequest.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=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=1107, serialized_end=1198) -_GETPARTICIPANTSTATUSRESPONSE_TRACK = _descriptor.Descriptor(name='Track', full_name='eve_public.campaign.objective.api.GetParticipantStatusResponse.Track', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='id', full_name='eve_public.campaign.objective.api.GetParticipantStatusResponse.Track.id', 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='stats', full_name='eve_public.campaign.objective.api.GetParticipantStatusResponse.Track.stats', 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=1421, serialized_end=1539) -_GETPARTICIPANTSTATUSRESPONSE = _descriptor.Descriptor(name='GetParticipantStatusResponse', full_name='eve_public.campaign.objective.api.GetParticipantStatusResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='commitment_state', full_name='eve_public.campaign.objective.api.GetParticipantStatusResponse.commitment_state', index=0, number=1, type=14, cpp_type=8, label=1, has_default_value=False, default_value=0, 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='no_commitment', full_name='eve_public.campaign.objective.api.GetParticipantStatusResponse.no_commitment', index=1, number=3, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, 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='tracks', full_name='eve_public.campaign.objective.api.GetParticipantStatusResponse.tracks', index=2, number=2, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], 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=[_GETPARTICIPANTSTATUSRESPONSE_TRACK], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[_descriptor.OneofDescriptor(name='commitment', full_name='eve_public.campaign.objective.api.GetParticipantStatusResponse.commitment', index=0, containing_type=None, create_key=_descriptor._internal_create_key, fields=[])], serialized_start=1201, serialized_end=1553) -_COMMITREQUEST = _descriptor.Descriptor(name='CommitRequest', full_name='eve_public.campaign.objective.api.CommitRequest', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='objective', full_name='eve_public.campaign.objective.api.CommitRequest.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=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=1555, serialized_end=1632) -_COMMITRESPONSE = _descriptor.Descriptor(name='CommitResponse', full_name='eve_public.campaign.objective.api.CommitResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=1634, serialized_end=1650) -_RESIGNREQUEST = _descriptor.Descriptor(name='ResignRequest', full_name='eve_public.campaign.objective.api.ResignRequest', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='objective', full_name='eve_public.campaign.objective.api.ResignRequest.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=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=1652, serialized_end=1729) -_RESIGNRESPONSE = _descriptor.Descriptor(name='ResignResponse', full_name='eve_public.campaign.objective.api.ResignResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=1731, serialized_end=1747) -_REDEEMREWARDSREQUEST = _descriptor.Descriptor(name='RedeemRewardsRequest', full_name='eve_public.campaign.objective.api.RedeemRewardsRequest', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='objective', full_name='eve_public.campaign.objective.api.RedeemRewardsRequest.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=1749, serialized_end=1837) -_REDEEMREWARDSRESPONSE = _descriptor.Descriptor(name='RedeemRewardsResponse', full_name='eve_public.campaign.objective.api.RedeemRewardsResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[], extensions=[], nested_types=[], enum_types=[], serialized_options='\x18\x01', is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=1839, serialized_end=1866) -_GETSTATSREQUEST = _descriptor.Descriptor(name='GetStatsRequest', full_name='eve_public.campaign.objective.api.GetStatsRequest', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='objective', full_name='eve_public.campaign.objective.api.GetStatsRequest.objective', index=0, number=1, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], 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=1868, serialized_end=1951) -_GETSTATSRESPONSE_OBJECTIVESTATS = _descriptor.Descriptor(name='ObjectiveStats', full_name='eve_public.campaign.objective.api.GetStatsResponse.ObjectiveStats', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='objective', full_name='eve_public.campaign.objective.api.GetStatsResponse.ObjectiveStats.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='stats', full_name='eve_public.campaign.objective.api.GetStatsResponse.ObjectiveStats.stats', 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=2068, serialized_end=2199) -_GETSTATSRESPONSE = _descriptor.Descriptor(name='GetStatsResponse', full_name='eve_public.campaign.objective.api.GetStatsResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='objective_stats', full_name='eve_public.campaign.objective.api.GetStatsResponse.objective_stats', index=0, number=1, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], 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=[_GETSTATSRESPONSE_OBJECTIVESTATS], enum_types=[], serialized_options='\x18\x01', is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=1954, serialized_end=2203) -_GETPARTICIPANTSTATSREQUEST = _descriptor.Descriptor(name='GetParticipantStatsRequest', full_name='eve_public.campaign.objective.api.GetParticipantStatsRequest', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='objective', full_name='eve_public.campaign.objective.api.GetParticipantStatsRequest.objective', index=0, number=1, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], 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=2205, serialized_end=2299) -_GETPARTICIPANTSTATSRESPONSE_PARTICIPANTSTATS = _descriptor.Descriptor(name='ParticipantStats', full_name='eve_public.campaign.objective.api.GetParticipantStatsResponse.ParticipantStats', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='objective', full_name='eve_public.campaign.objective.api.GetParticipantStatsResponse.ParticipantStats.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='stats', full_name='eve_public.campaign.objective.api.GetParticipantStatsResponse.ParticipantStats.stats', 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), _descriptor.FieldDescriptor(name='no_participation', full_name='eve_public.campaign.objective.api.GetParticipantStatsResponse.ParticipantStats.no_participation', index=2, number=3, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, 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=[_descriptor.OneofDescriptor(name='participation_stats', full_name='eve_public.campaign.objective.api.GetParticipantStatsResponse.ParticipantStats.participation_stats', index=0, containing_type=None, create_key=_descriptor._internal_create_key, fields=[])], serialized_start=2442, serialized_end=2639) -_GETPARTICIPANTSTATSRESPONSE = _descriptor.Descriptor(name='GetParticipantStatsResponse', full_name='eve_public.campaign.objective.api.GetParticipantStatsResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='participant_stats', full_name='eve_public.campaign.objective.api.GetParticipantStatsResponse.participant_stats', index=0, number=1, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], 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=[_GETPARTICIPANTSTATSRESPONSE_PARTICIPANTSTATS], enum_types=[], serialized_options='\x18\x01', is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=2302, serialized_end=2643) +_GETRESPONSE_TRACK = _descriptor.Descriptor(name='Track', full_name='eve_public.campaign.objective.api.GetResponse.Track', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='id', full_name='eve_public.campaign.objective.api.GetResponse.Track.id', 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='attributes', full_name='eve_public.campaign.objective.api.GetResponse.Track.attributes', 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=572, serialized_end=689) +_GETRESPONSE = _descriptor.Descriptor(name='GetResponse', full_name='eve_public.campaign.objective.api.GetResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='attributes', full_name='eve_public.campaign.objective.api.GetResponse.attributes', 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='tracks', full_name='eve_public.campaign.objective.api.GetResponse.tracks', index=1, number=2, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], 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='version', full_name='eve_public.campaign.objective.api.GetResponse.version', index=2, number=3, 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=[_GETRESPONSE_TRACK], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=377, serialized_end=689) +_GETSTATUSREQUEST = _descriptor.Descriptor(name='GetStatusRequest', full_name='eve_public.campaign.objective.api.GetStatusRequest', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='objective', full_name='eve_public.campaign.objective.api.GetStatusRequest.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=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=691, serialized_end=771) +_GETSTATUSRESPONSE_TRACK = _descriptor.Descriptor(name='Track', full_name='eve_public.campaign.objective.api.GetStatusResponse.Track', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='id', full_name='eve_public.campaign.objective.api.GetStatusResponse.Track.id', 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='state', full_name='eve_public.campaign.objective.api.GetStatusResponse.Track.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), _descriptor.FieldDescriptor(name='stats', full_name='eve_public.campaign.objective.api.GetStatusResponse.Track.stats', index=2, number=3, 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=987, serialized_end=1152) +_GETSTATUSRESPONSE = _descriptor.Descriptor(name='GetStatusResponse', full_name='eve_public.campaign.objective.api.GetStatusResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='state', full_name='eve_public.campaign.objective.api.GetStatusResponse.state', 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='stats', full_name='eve_public.campaign.objective.api.GetStatusResponse.stats', 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), _descriptor.FieldDescriptor(name='tracks', full_name='eve_public.campaign.objective.api.GetStatusResponse.tracks', index=2, number=3, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], 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=[_GETSTATUSRESPONSE_TRACK], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=774, serialized_end=1152) +_GETPARTICIPANTSTATUSREQUEST = _descriptor.Descriptor(name='GetParticipantStatusRequest', full_name='eve_public.campaign.objective.api.GetParticipantStatusRequest', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='objective', full_name='eve_public.campaign.objective.api.GetParticipantStatusRequest.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=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=1154, serialized_end=1245) +_GETPARTICIPANTSTATUSRESPONSE_TRACK = _descriptor.Descriptor(name='Track', full_name='eve_public.campaign.objective.api.GetParticipantStatusResponse.Track', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='id', full_name='eve_public.campaign.objective.api.GetParticipantStatusResponse.Track.id', 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='stats', full_name='eve_public.campaign.objective.api.GetParticipantStatusResponse.Track.stats', 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=1468, serialized_end=1586) +_GETPARTICIPANTSTATUSRESPONSE = _descriptor.Descriptor(name='GetParticipantStatusResponse', full_name='eve_public.campaign.objective.api.GetParticipantStatusResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='commitment_state', full_name='eve_public.campaign.objective.api.GetParticipantStatusResponse.commitment_state', index=0, number=1, type=14, cpp_type=8, label=1, has_default_value=False, default_value=0, 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='no_commitment', full_name='eve_public.campaign.objective.api.GetParticipantStatusResponse.no_commitment', index=1, number=3, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, 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='tracks', full_name='eve_public.campaign.objective.api.GetParticipantStatusResponse.tracks', index=2, number=2, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], 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=[_GETPARTICIPANTSTATUSRESPONSE_TRACK], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[_descriptor.OneofDescriptor(name='commitment', full_name='eve_public.campaign.objective.api.GetParticipantStatusResponse.commitment', index=0, containing_type=None, create_key=_descriptor._internal_create_key, fields=[])], serialized_start=1248, serialized_end=1600) +_COMMITREQUEST = _descriptor.Descriptor(name='CommitRequest', full_name='eve_public.campaign.objective.api.CommitRequest', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='objective', full_name='eve_public.campaign.objective.api.CommitRequest.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=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=1602, serialized_end=1679) +_COMMITRESPONSE = _descriptor.Descriptor(name='CommitResponse', full_name='eve_public.campaign.objective.api.CommitResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=1681, serialized_end=1697) +_RESIGNREQUEST = _descriptor.Descriptor(name='ResignRequest', full_name='eve_public.campaign.objective.api.ResignRequest', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='objective', full_name='eve_public.campaign.objective.api.ResignRequest.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=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=1699, serialized_end=1776) +_RESIGNRESPONSE = _descriptor.Descriptor(name='ResignResponse', full_name='eve_public.campaign.objective.api.ResignResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=1778, serialized_end=1794) +_REDEEMREWARDSREQUEST = _descriptor.Descriptor(name='RedeemRewardsRequest', full_name='eve_public.campaign.objective.api.RedeemRewardsRequest', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='objective', full_name='eve_public.campaign.objective.api.RedeemRewardsRequest.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=1796, serialized_end=1884) +_REDEEMREWARDSRESPONSE = _descriptor.Descriptor(name='RedeemRewardsResponse', full_name='eve_public.campaign.objective.api.RedeemRewardsResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[], extensions=[], nested_types=[], enum_types=[], serialized_options='\x18\x01', is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=1886, serialized_end=1913) +_GETSTATSREQUEST = _descriptor.Descriptor(name='GetStatsRequest', full_name='eve_public.campaign.objective.api.GetStatsRequest', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='objective', full_name='eve_public.campaign.objective.api.GetStatsRequest.objective', index=0, number=1, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], 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=1915, serialized_end=1998) +_GETSTATSRESPONSE_OBJECTIVESTATS = _descriptor.Descriptor(name='ObjectiveStats', full_name='eve_public.campaign.objective.api.GetStatsResponse.ObjectiveStats', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='objective', full_name='eve_public.campaign.objective.api.GetStatsResponse.ObjectiveStats.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='stats', full_name='eve_public.campaign.objective.api.GetStatsResponse.ObjectiveStats.stats', 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=2115, serialized_end=2246) +_GETSTATSRESPONSE = _descriptor.Descriptor(name='GetStatsResponse', full_name='eve_public.campaign.objective.api.GetStatsResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='objective_stats', full_name='eve_public.campaign.objective.api.GetStatsResponse.objective_stats', index=0, number=1, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], 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=[_GETSTATSRESPONSE_OBJECTIVESTATS], enum_types=[], serialized_options='\x18\x01', is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=2001, serialized_end=2250) +_GETPARTICIPANTSTATSREQUEST = _descriptor.Descriptor(name='GetParticipantStatsRequest', full_name='eve_public.campaign.objective.api.GetParticipantStatsRequest', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='objective', full_name='eve_public.campaign.objective.api.GetParticipantStatsRequest.objective', index=0, number=1, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], 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=2252, serialized_end=2346) +_GETPARTICIPANTSTATSRESPONSE_PARTICIPANTSTATS = _descriptor.Descriptor(name='ParticipantStats', full_name='eve_public.campaign.objective.api.GetParticipantStatsResponse.ParticipantStats', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='objective', full_name='eve_public.campaign.objective.api.GetParticipantStatsResponse.ParticipantStats.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='stats', full_name='eve_public.campaign.objective.api.GetParticipantStatsResponse.ParticipantStats.stats', 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), _descriptor.FieldDescriptor(name='no_participation', full_name='eve_public.campaign.objective.api.GetParticipantStatsResponse.ParticipantStats.no_participation', index=2, number=3, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, 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=[_descriptor.OneofDescriptor(name='participation_stats', full_name='eve_public.campaign.objective.api.GetParticipantStatsResponse.ParticipantStats.participation_stats', index=0, containing_type=None, create_key=_descriptor._internal_create_key, fields=[])], serialized_start=2489, serialized_end=2686) +_GETPARTICIPANTSTATSRESPONSE = _descriptor.Descriptor(name='GetParticipantStatsResponse', full_name='eve_public.campaign.objective.api.GetParticipantStatsResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='participant_stats', full_name='eve_public.campaign.objective.api.GetParticipantStatsResponse.participant_stats', index=0, number=1, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], 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=[_GETPARTICIPANTSTATSRESPONSE_PARTICIPANTSTATS], enum_types=[], serialized_options='\x18\x01', is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=2349, serialized_end=2690) _GETREQUEST.fields_by_name['objective'].message_type = eve__public_dot_campaign_dot_objective_dot_objective__pb2._IDENTIFIER _GETREQUEST.fields_by_name['version'].message_type = eve__public_dot_campaign_dot_campaign__pb2._VERSION _GETREQUEST.oneofs_by_name['current_version'].fields.append(_GETREQUEST.fields_by_name['no_version']) @@ -40,6 +40,7 @@ _GETRESPONSE_TRACK.fields_by_name['attributes'].message_type = eve__public_dot_c _GETRESPONSE_TRACK.containing_type = _GETRESPONSE _GETRESPONSE.fields_by_name['attributes'].message_type = eve__public_dot_campaign_dot_objective_dot_objective__pb2._ATTRIBUTES _GETRESPONSE.fields_by_name['tracks'].message_type = _GETRESPONSE_TRACK +_GETRESPONSE.fields_by_name['version'].message_type = eve__public_dot_campaign_dot_campaign__pb2._VERSION _GETSTATUSREQUEST.fields_by_name['objective'].message_type = eve__public_dot_campaign_dot_objective_dot_objective__pb2._IDENTIFIER _GETSTATUSRESPONSE_TRACK.fields_by_name['id'].message_type = eve__public_dot_campaign_dot_track_dot_track__pb2._IDENTIFIER _GETSTATUSRESPONSE_TRACK.fields_by_name['state'].message_type = eve__public_dot_campaign_dot_track_dot_track__pb2._LIFECYCLESTATE diff --git a/multiprocessing/pool.pyc b/multiprocessing/pool.pyc Binary files differ. diff --git a/objectives/client/objective_task/duration.py b/objectives/client/objective_task/duration.py @@ -8,11 +8,10 @@ class DurationTask(ObjectiveTask): objective_task_content_id = 69 WIDGET = DurationTaskWidget - def __init__(self, start_time = None, stop_timer = None, **kwargs): + def __init__(self, start_time = None, stop_time = None, **kwargs): super(DurationTask, self).__init__(**kwargs) self._start_time = start_time or None - self._stop_timer = stop_timer or False - self._duration = 0 + self._stop_time = stop_time or None @property def start_time(self): @@ -26,23 +25,23 @@ class DurationTask(ObjectiveTask): self.update() @property - def stop_timer(self): - return self._stop_timer + def stop_time(self): + return self._stop_time - @stop_timer.setter - def stop_timer(self, value): - if self._stop_timer == value: + @stop_time.setter + def stop_time(self, value): + if self._stop_time == value: return - self._stop_timer = value + self._stop_time = value self.update() @property def duration(self): if not self._start_time: - self._duration = 0 - elif not self.completed: - self._duration = GetSimTime() - self._start_time - return self._duration + return 0 + if self._stop_time: + return self._stop_time - self._start_time + return GetSimTime() - self._start_time @property def value(self): @@ -51,4 +50,4 @@ class DurationTask(ObjectiveTask): def _update(self): self.on_update(objective_task=self) self.hidden = not self._start_time - self.completed = self._stop_timer + self.completed = self._stop_time diff --git a/requests/packages/chardet/jpcntx.py b/requests/packages/chardet/jpcntx.py @@ -0,0 +1,6983 @@ +#Embedded file name: C:\BuildAgent\work\20d73f1b24eed06e\eve\release\V24.01\packages\requests\packages\chardet\jpcntx.py +from .compat import wrap_ord +NUM_OF_CATEGORY = 6 +DONT_KNOW = -1 +ENOUGH_REL_THRESHOLD = 100 +MAX_REL_THRESHOLD = 1000 +MINIMUM_DATA_THRESHOLD = 4 +jp2CharContext = ((0, + 0, + 0, + 2, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1), + (2, + 4, + 0, + 4, + 0, + 3, + 0, + 4, + 0, + 3, + 4, + 4, + 4, + 2, + 4, + 3, + 3, + 4, + 3, + 2, + 3, + 3, + 4, + 2, + 3, + 3, + 3, + 2, + 4, + 1, + 4, + 3, + 3, + 1, + 5, + 4, + 3, + 4, + 3, + 4, + 3, + 5, + 3, + 0, + 3, + 5, + 4, + 2, + 0, + 3, + 1, + 0, + 3, + 3, + 0, + 3, + 3, + 0, + 1, + 1, + 0, + 4, + 3, + 0, + 3, + 3, + 0, + 4, + 0, + 2, + 0, + 3, + 5, + 5, + 5, + 5, + 4, + 0, + 4, + 1, + 0, + 3, + 4), + (0, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 2), + (0, + 4, + 0, + 5, + 0, + 5, + 0, + 4, + 0, + 4, + 5, + 4, + 4, + 3, + 5, + 3, + 5, + 1, + 5, + 3, + 4, + 3, + 4, + 4, + 3, + 4, + 3, + 3, + 4, + 3, + 5, + 4, + 4, + 3, + 5, + 5, + 3, + 5, + 5, + 5, + 3, + 5, + 5, + 3, + 4, + 5, + 5, + 3, + 1, + 3, + 2, + 0, + 3, + 4, + 0, + 4, + 2, + 0, + 4, + 2, + 1, + 5, + 3, + 2, + 3, + 5, + 0, + 4, + 0, + 2, + 0, + 5, + 4, + 4, + 5, + 4, + 5, + 0, + 4, + 0, + 0, + 4, + 4), + (0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0), + (0, + 3, + 0, + 4, + 0, + 3, + 0, + 3, + 0, + 4, + 5, + 4, + 3, + 3, + 3, + 3, + 4, + 3, + 5, + 4, + 4, + 3, + 5, + 4, + 4, + 3, + 4, + 3, + 4, + 4, + 4, + 4, + 5, + 3, + 4, + 4, + 3, + 4, + 5, + 5, + 4, + 5, + 5, + 1, + 4, + 5, + 4, + 3, + 0, + 3, + 3, + 1, + 3, + 3, + 0, + 4, + 4, + 0, + 3, + 3, + 1, + 5, + 3, + 3, + 3, + 5, + 0, + 4, + 0, + 3, + 0, + 4, + 4, + 3, + 4, + 3, + 3, + 0, + 4, + 1, + 1, + 3, + 4), + (0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0), + (0, + 4, + 0, + 3, + 0, + 3, + 0, + 4, + 0, + 3, + 4, + 4, + 3, + 2, + 2, + 1, + 2, + 1, + 3, + 1, + 3, + 3, + 3, + 3, + 3, + 4, + 3, + 1, + 3, + 3, + 5, + 3, + 3, + 0, + 4, + 3, + 0, + 5, + 4, + 3, + 3, + 5, + 4, + 4, + 3, + 4, + 4, + 5, + 0, + 1, + 2, + 0, + 1, + 2, + 0, + 2, + 2, + 0, + 1, + 0, + 0, + 5, + 2, + 2, + 1, + 4, + 0, + 3, + 0, + 1, + 0, + 4, + 4, + 3, + 5, + 4, + 3, + 0, + 2, + 1, + 0, + 4, + 3), + (0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0), + (0, + 3, + 0, + 5, + 0, + 4, + 0, + 2, + 1, + 4, + 4, + 2, + 4, + 1, + 4, + 2, + 4, + 2, + 4, + 3, + 3, + 3, + 4, + 3, + 3, + 3, + 3, + 1, + 4, + 2, + 3, + 3, + 3, + 1, + 4, + 4, + 1, + 1, + 1, + 4, + 3, + 3, + 2, + 0, + 2, + 4, + 3, + 2, + 0, + 3, + 3, + 0, + 3, + 1, + 1, + 0, + 0, + 0, + 3, + 3, + 0, + 4, + 2, + 2, + 3, + 4, + 0, + 4, + 0, + 3, + 0, + 4, + 4, + 5, + 3, + 4, + 4, + 0, + 3, + 0, + 0, + 1, + 4), + (1, + 4, + 0, + 4, + 0, + 4, + 0, + 4, + 0, + 3, + 5, + 4, + 4, + 3, + 4, + 3, + 5, + 4, + 3, + 3, + 4, + 3, + 5, + 4, + 4, + 4, + 4, + 3, + 4, + 2, + 4, + 3, + 3, + 1, + 5, + 4, + 3, + 2, + 4, + 5, + 4, + 5, + 5, + 4, + 4, + 5, + 4, + 4, + 0, + 3, + 2, + 2, + 3, + 3, + 0, + 4, + 3, + 1, + 3, + 2, + 1, + 4, + 3, + 3, + 4, + 5, + 0, + 3, + 0, + 2, + 0, + 4, + 5, + 5, + 4, + 5, + 4, + 0, + 4, + 0, + 0, + 5, + 4), + (0, + 5, + 0, + 5, + 0, + 4, + 0, + 3, + 0, + 4, + 4, + 3, + 4, + 3, + 3, + 3, + 4, + 0, + 4, + 4, + 4, + 3, + 4, + 3, + 4, + 3, + 3, + 1, + 4, + 2, + 4, + 3, + 4, + 0, + 5, + 4, + 1, + 4, + 5, + 4, + 4, + 5, + 3, + 2, + 4, + 3, + 4, + 3, + 2, + 4, + 1, + 3, + 3, + 3, + 2, + 3, + 2, + 0, + 4, + 3, + 3, + 4, + 3, + 3, + 3, + 4, + 0, + 4, + 0, + 3, + 0, + 4, + 5, + 4, + 4, + 4, + 3, + 0, + 4, + 1, + 0, + 1, + 3), + (0, + 3, + 1, + 4, + 0, + 3, + 0, + 2, + 0, + 3, + 4, + 4, + 3, + 1, + 4, + 2, + 3, + 3, + 4, + 3, + 4, + 3, + 4, + 3, + 4, + 4, + 3, + 2, + 3, + 1, + 5, + 4, + 4, + 1, + 4, + 4, + 3, + 5, + 4, + 4, + 3, + 5, + 5, + 4, + 3, + 4, + 4, + 3, + 1, + 2, + 3, + 1, + 2, + 2, + 0, + 3, + 2, + 0, + 3, + 1, + 0, + 5, + 3, + 3, + 3, + 4, + 3, + 3, + 3, + 3, + 4, + 4, + 4, + 4, + 5, + 4, + 2, + 0, + 3, + 3, + 2, + 4, + 3), + (0, + 2, + 0, + 3, + 0, + 1, + 0, + 1, + 0, + 0, + 3, + 2, + 0, + 0, + 2, + 0, + 1, + 0, + 2, + 1, + 3, + 3, + 3, + 1, + 2, + 3, + 1, + 0, + 1, + 0, + 4, + 2, + 1, + 1, + 3, + 3, + 0, + 4, + 3, + 3, + 1, + 4, + 3, + 3, + 0, + 3, + 3, + 2, + 0, + 0, + 0, + 0, + 1, + 0, + 0, + 2, + 0, + 0, + 0, + 0, + 0, + 4, + 1, + 0, + 2, + 3, + 2, + 2, + 2, + 1, + 3, + 3, + 3, + 4, + 4, + 3, + 2, + 0, + 3, + 1, + 0, + 3, + 3), + (0, + 4, + 0, + 4, + 0, + 3, + 0, + 3, + 0, + 4, + 4, + 4, + 3, + 3, + 3, + 3, + 3, + 3, + 4, + 3, + 4, + 2, + 4, + 3, + 4, + 3, + 3, + 2, + 4, + 3, + 4, + 5, + 4, + 1, + 4, + 5, + 3, + 5, + 4, + 5, + 3, + 5, + 4, + 0, + 3, + 5, + 5, + 3, + 1, + 3, + 3, + 2, + 2, + 3, + 0, + 3, + 4, + 1, + 3, + 3, + 2, + 4, + 3, + 3, + 3, + 4, + 0, + 4, + 0, + 3, + 0, + 4, + 5, + 4, + 4, + 5, + 3, + 0, + 4, + 1, + 0, + 3, + 4), + (0, + 2, + 0, + 3, + 0, + 3, + 0, + 0, + 0, + 2, + 2, + 2, + 1, + 0, + 1, + 0, + 0, + 0, + 3, + 0, + 3, + 0, + 3, + 0, + 1, + 3, + 1, + 0, + 3, + 1, + 3, + 3, + 3, + 1, + 3, + 3, + 3, + 0, + 1, + 3, + 1, + 3, + 4, + 0, + 0, + 3, + 1, + 1, + 0, + 3, + 2, + 0, + 0, + 0, + 0, + 1, + 3, + 0, + 1, + 0, + 0, + 3, + 3, + 2, + 0, + 3, + 0, + 0, + 0, + 0, + 0, + 3, + 4, + 3, + 4, + 3, + 3, + 0, + 3, + 0, + 0, + 2, + 3), + (2, + 3, + 0, + 3, + 0, + 2, + 0, + 1, + 0, + 3, + 3, + 4, + 3, + 1, + 3, + 1, + 1, + 1, + 3, + 1, + 4, + 3, + 4, + 3, + 3, + 3, + 0, + 0, + 3, + 1, + 5, + 4, + 3, + 1, + 4, + 3, + 2, + 5, + 5, + 4, + 4, + 4, + 4, + 3, + 3, + 4, + 4, + 4, + 0, + 2, + 1, + 1, + 3, + 2, + 0, + 1, + 2, + 0, + 0, + 1, + 0, + 4, + 1, + 3, + 3, + 3, + 0, + 3, + 0, + 1, + 0, + 4, + 4, + 4, + 5, + 5, + 3, + 0, + 2, + 0, + 0, + 4, + 4), + (0, + 2, + 0, + 1, + 0, + 3, + 1, + 3, + 0, + 2, + 3, + 3, + 3, + 0, + 3, + 1, + 0, + 0, + 3, + 0, + 3, + 2, + 3, + 1, + 3, + 2, + 1, + 1, + 0, + 0, + 4, + 2, + 1, + 0, + 2, + 3, + 1, + 4, + 3, + 2, + 0, + 4, + 4, + 3, + 1, + 3, + 1, + 3, + 0, + 1, + 0, + 0, + 1, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 4, + 1, + 1, + 1, + 2, + 0, + 3, + 0, + 0, + 0, + 3, + 4, + 2, + 4, + 3, + 2, + 0, + 1, + 0, + 0, + 3, + 3), + (0, + 1, + 0, + 4, + 0, + 5, + 0, + 4, + 0, + 2, + 4, + 4, + 2, + 3, + 3, + 2, + 3, + 3, + 5, + 3, + 3, + 3, + 4, + 3, + 4, + 2, + 3, + 0, + 4, + 3, + 3, + 3, + 4, + 1, + 4, + 3, + 2, + 1, + 5, + 5, + 3, + 4, + 5, + 1, + 3, + 5, + 4, + 2, + 0, + 3, + 3, + 0, + 1, + 3, + 0, + 4, + 2, + 0, + 1, + 3, + 1, + 4, + 3, + 3, + 3, + 3, + 0, + 3, + 0, + 1, + 0, + 3, + 4, + 4, + 4, + 5, + 5, + 0, + 3, + 0, + 1, + 4, + 5), + (0, + 2, + 0, + 3, + 0, + 3, + 0, + 0, + 0, + 2, + 3, + 1, + 3, + 0, + 4, + 0, + 1, + 1, + 3, + 0, + 3, + 4, + 3, + 2, + 3, + 1, + 0, + 3, + 3, + 2, + 3, + 1, + 3, + 0, + 2, + 3, + 0, + 2, + 1, + 4, + 1, + 2, + 2, + 0, + 0, + 3, + 3, + 0, + 0, + 2, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 2, + 2, + 0, + 3, + 2, + 1, + 3, + 3, + 0, + 2, + 0, + 2, + 0, + 0, + 3, + 3, + 1, + 2, + 4, + 0, + 3, + 0, + 2, + 2, + 3), + (2, + 4, + 0, + 5, + 0, + 4, + 0, + 4, + 0, + 2, + 4, + 4, + 4, + 3, + 4, + 3, + 3, + 3, + 1, + 2, + 4, + 3, + 4, + 3, + 4, + 4, + 5, + 0, + 3, + 3, + 3, + 3, + 2, + 0, + 4, + 3, + 1, + 4, + 3, + 4, + 1, + 4, + 4, + 3, + 3, + 4, + 4, + 3, + 1, + 2, + 3, + 0, + 4, + 2, + 0, + 4, + 1, + 0, + 3, + 3, + 0, + 4, + 3, + 3, + 3, + 4, + 0, + 4, + 0, + 2, + 0, + 3, + 5, + 3, + 4, + 5, + 2, + 0, + 3, + 0, + 0, + 4, + 5), + (0, + 3, + 0, + 4, + 0, + 1, + 0, + 1, + 0, + 1, + 3, + 2, + 2, + 1, + 3, + 0, + 3, + 0, + 2, + 0, + 2, + 0, + 3, + 0, + 2, + 0, + 0, + 0, + 1, + 0, + 1, + 1, + 0, + 0, + 3, + 1, + 0, + 0, + 0, + 4, + 0, + 3, + 1, + 0, + 2, + 1, + 3, + 0, + 0, + 0, + 0, + 0, + 0, + 3, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 4, + 2, + 2, + 3, + 1, + 0, + 3, + 0, + 0, + 0, + 1, + 4, + 4, + 4, + 3, + 0, + 0, + 4, + 0, + 0, + 1, + 4), + (1, + 4, + 1, + 5, + 0, + 3, + 0, + 3, + 0, + 4, + 5, + 4, + 4, + 3, + 5, + 3, + 3, + 4, + 4, + 3, + 4, + 1, + 3, + 3, + 3, + 3, + 2, + 1, + 4, + 1, + 5, + 4, + 3, + 1, + 4, + 4, + 3, + 5, + 4, + 4, + 3, + 5, + 4, + 3, + 3, + 4, + 4, + 4, + 0, + 3, + 3, + 1, + 2, + 3, + 0, + 3, + 1, + 0, + 3, + 3, + 0, + 5, + 4, + 4, + 4, + 4, + 4, + 4, + 3, + 3, + 5, + 4, + 4, + 3, + 3, + 5, + 4, + 0, + 3, + 2, + 0, + 4, + 4), + (0, + 2, + 0, + 3, + 0, + 1, + 0, + 0, + 0, + 1, + 3, + 3, + 3, + 2, + 4, + 1, + 3, + 0, + 3, + 1, + 3, + 0, + 2, + 2, + 1, + 1, + 0, + 0, + 2, + 0, + 4, + 3, + 1, + 0, + 4, + 3, + 0, + 4, + 4, + 4, + 1, + 4, + 3, + 1, + 1, + 3, + 3, + 1, + 0, + 2, + 0, + 0, + 1, + 3, + 0, + 0, + 0, + 0, + 2, + 0, + 0, + 4, + 3, + 2, + 4, + 3, + 5, + 4, + 3, + 3, + 3, + 4, + 3, + 3, + 4, + 3, + 3, + 0, + 2, + 1, + 0, + 3, + 3), + (0, + 2, + 0, + 4, + 0, + 3, + 0, + 2, + 0, + 2, + 5, + 5, + 3, + 4, + 4, + 4, + 4, + 1, + 4, + 3, + 3, + 0, + 4, + 3, + 4, + 3, + 1, + 3, + 3, + 2, + 4, + 3, + 0, + 3, + 4, + 3, + 0, + 3, + 4, + 4, + 2, + 4, + 4, + 0, + 4, + 5, + 3, + 3, + 2, + 2, + 1, + 1, + 1, + 2, + 0, + 1, + 5, + 0, + 3, + 3, + 2, + 4, + 3, + 3, + 3, + 4, + 0, + 3, + 0, + 2, + 0, + 4, + 4, + 3, + 5, + 5, + 0, + 0, + 3, + 0, + 2, + 3, + 3), + (0, + 3, + 0, + 4, + 0, + 3, + 0, + 1, + 0, + 3, + 4, + 3, + 3, + 1, + 3, + 3, + 3, + 0, + 3, + 1, + 3, + 0, + 4, + 3, + 3, + 1, + 1, + 0, + 3, + 0, + 3, + 3, + 0, + 0, + 4, + 4, + 0, + 1, + 5, + 4, + 3, + 3, + 5, + 0, + 3, + 3, + 4, + 3, + 0, + 2, + 0, + 1, + 1, + 1, + 0, + 1, + 3, + 0, + 1, + 2, + 1, + 3, + 3, + 2, + 3, + 3, + 0, + 3, + 0, + 1, + 0, + 1, + 3, + 3, + 4, + 4, + 1, + 0, + 1, + 2, + 2, + 1, + 3), + (0, + 1, + 0, + 4, + 0, + 4, + 0, + 3, + 0, + 1, + 3, + 3, + 3, + 2, + 3, + 1, + 1, + 0, + 3, + 0, + 3, + 3, + 4, + 3, + 2, + 4, + 2, + 0, + 1, + 0, + 4, + 3, + 2, + 0, + 4, + 3, + 0, + 5, + 3, + 3, + 2, + 4, + 4, + 4, + 3, + 3, + 3, + 4, + 0, + 1, + 3, + 0, + 0, + 1, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 4, + 2, + 3, + 3, + 3, + 0, + 3, + 0, + 0, + 0, + 4, + 4, + 4, + 5, + 3, + 2, + 0, + 3, + 3, + 0, + 3, + 5), + (0, + 2, + 0, + 3, + 0, + 0, + 0, + 3, + 0, + 1, + 3, + 0, + 2, + 0, + 0, + 0, + 1, + 0, + 3, + 1, + 1, + 3, + 3, + 0, + 0, + 3, + 0, + 0, + 3, + 0, + 2, + 3, + 1, + 0, + 3, + 1, + 0, + 3, + 3, + 2, + 0, + 4, + 2, + 2, + 0, + 2, + 0, + 0, + 0, + 4, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 2, + 1, + 2, + 0, + 1, + 0, + 1, + 0, + 0, + 0, + 1, + 3, + 1, + 2, + 0, + 0, + 0, + 1, + 0, + 0, + 1, + 4), + (0, + 3, + 0, + 3, + 0, + 5, + 0, + 1, + 0, + 2, + 4, + 3, + 1, + 3, + 3, + 2, + 1, + 1, + 5, + 2, + 1, + 0, + 5, + 1, + 2, + 0, + 0, + 0, + 3, + 3, + 2, + 2, + 3, + 2, + 4, + 3, + 0, + 0, + 3, + 3, + 1, + 3, + 3, + 0, + 2, + 5, + 3, + 4, + 0, + 3, + 3, + 0, + 1, + 2, + 0, + 2, + 2, + 0, + 3, + 2, + 0, + 2, + 2, + 3, + 3, + 3, + 0, + 2, + 0, + 1, + 0, + 3, + 4, + 4, + 2, + 5, + 4, + 0, + 3, + 0, + 0, + 3, + 5), + (0, + 3, + 0, + 3, + 0, + 3, + 0, + 1, + 0, + 3, + 3, + 3, + 3, + 0, + 3, + 0, + 2, + 0, + 2, + 1, + 1, + 0, + 2, + 0, + 1, + 0, + 0, + 0, + 2, + 1, + 0, + 0, + 1, + 0, + 3, + 2, + 0, + 0, + 3, + 3, + 1, + 2, + 3, + 1, + 0, + 3, + 3, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 2, + 0, + 0, + 0, + 0, + 0, + 2, + 3, + 1, + 2, + 3, + 0, + 3, + 0, + 1, + 0, + 3, + 2, + 1, + 0, + 4, + 3, + 0, + 1, + 1, + 0, + 3, + 3), + (0, + 4, + 0, + 5, + 0, + 3, + 0, + 3, + 0, + 4, + 5, + 5, + 4, + 3, + 5, + 3, + 4, + 3, + 5, + 3, + 3, + 2, + 5, + 3, + 4, + 4, + 4, + 3, + 4, + 3, + 4, + 5, + 5, + 3, + 4, + 4, + 3, + 4, + 4, + 5, + 4, + 4, + 4, + 3, + 4, + 5, + 5, + 4, + 2, + 3, + 4, + 2, + 3, + 4, + 0, + 3, + 3, + 1, + 4, + 3, + 2, + 4, + 3, + 3, + 5, + 5, + 0, + 3, + 0, + 3, + 0, + 5, + 5, + 5, + 5, + 4, + 4, + 0, + 4, + 0, + 1, + 4, + 4), + (0, + 4, + 0, + 4, + 0, + 3, + 0, + 3, + 0, + 3, + 5, + 4, + 4, + 2, + 3, + 2, + 5, + 1, + 3, + 2, + 5, + 1, + 4, + 2, + 3, + 2, + 3, + 3, + 4, + 3, + 3, + 3, + 3, + 2, + 5, + 4, + 1, + 3, + 3, + 5, + 3, + 4, + 4, + 0, + 4, + 4, + 3, + 1, + 1, + 3, + 1, + 0, + 2, + 3, + 0, + 2, + 3, + 0, + 3, + 0, + 0, + 4, + 3, + 1, + 3, + 4, + 0, + 3, + 0, + 2, + 0, + 4, + 4, + 4, + 3, + 4, + 5, + 0, + 4, + 0, + 0, + 3, + 4), + (0, + 3, + 0, + 3, + 0, + 3, + 1, + 2, + 0, + 3, + 4, + 4, + 3, + 3, + 3, + 0, + 2, + 2, + 4, + 3, + 3, + 1, + 3, + 3, + 3, + 1, + 1, + 0, + 3, + 1, + 4, + 3, + 2, + 3, + 4, + 4, + 2, + 4, + 4, + 4, + 3, + 4, + 4, + 3, + 2, + 4, + 4, + 3, + 1, + 3, + 3, + 1, + 3, + 3, + 0, + 4, + 1, + 0, + 2, + 2, + 1, + 4, + 3, + 2, + 3, + 3, + 5, + 4, + 3, + 3, + 5, + 4, + 4, + 3, + 3, + 0, + 4, + 0, + 3, + 2, + 2, + 4, + 4), + (0, + 2, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 1, + 2, + 1, + 3, + 0, + 0, + 0, + 0, + 0, + 2, + 0, + 1, + 2, + 1, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 3, + 0, + 0, + 1, + 0, + 1, + 1, + 3, + 1, + 0, + 0, + 0, + 1, + 1, + 0, + 1, + 1, + 0, + 0, + 0, + 0, + 0, + 2, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 1, + 2, + 2, + 0, + 3, + 4, + 0, + 0, + 0, + 1, + 1, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 1, + 1), + (0, + 1, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 4, + 0, + 4, + 1, + 4, + 0, + 3, + 0, + 4, + 0, + 3, + 0, + 4, + 0, + 3, + 0, + 3, + 0, + 4, + 1, + 5, + 1, + 4, + 0, + 0, + 3, + 0, + 5, + 0, + 5, + 2, + 0, + 1, + 0, + 0, + 0, + 2, + 1, + 4, + 0, + 1, + 3, + 0, + 0, + 3, + 0, + 0, + 3, + 1, + 1, + 4, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0), + (1, + 4, + 0, + 5, + 0, + 3, + 0, + 2, + 0, + 3, + 5, + 4, + 4, + 3, + 4, + 3, + 5, + 3, + 4, + 3, + 3, + 0, + 4, + 3, + 3, + 3, + 3, + 3, + 3, + 2, + 4, + 4, + 3, + 1, + 3, + 4, + 4, + 5, + 4, + 4, + 3, + 4, + 4, + 1, + 3, + 5, + 4, + 3, + 3, + 3, + 1, + 2, + 2, + 3, + 3, + 1, + 3, + 1, + 3, + 3, + 3, + 5, + 3, + 3, + 4, + 5, + 0, + 3, + 0, + 3, + 0, + 3, + 4, + 3, + 4, + 4, + 3, + 0, + 3, + 0, + 2, + 4, + 3), + (0, + 1, + 0, + 4, + 0, + 0, + 0, + 0, + 0, + 1, + 4, + 0, + 4, + 1, + 4, + 2, + 4, + 0, + 3, + 0, + 1, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 2, + 0, + 3, + 1, + 1, + 1, + 0, + 3, + 0, + 0, + 0, + 1, + 2, + 1, + 0, + 0, + 1, + 1, + 1, + 1, + 0, + 1, + 0, + 0, + 0, + 1, + 0, + 0, + 3, + 0, + 0, + 0, + 0, + 3, + 2, + 0, + 2, + 2, + 0, + 1, + 0, + 0, + 0, + 2, + 3, + 2, + 3, + 3, + 0, + 0, + 0, + 0, + 2, + 1, + 0), + (0, + 5, + 1, + 5, + 0, + 3, + 0, + 3, + 0, + 5, + 4, + 4, + 5, + 1, + 5, + 3, + 3, + 0, + 4, + 3, + 4, + 3, + 5, + 3, + 4, + 3, + 3, + 2, + 4, + 3, + 4, + 3, + 3, + 0, + 3, + 3, + 1, + 4, + 4, + 3, + 4, + 4, + 4, + 3, + 4, + 5, + 5, + 3, + 2, + 3, + 1, + 1, + 3, + 3, + 1, + 3, + 1, + 1, + 3, + 3, + 2, + 4, + 5, + 3, + 3, + 5, + 0, + 4, + 0, + 3, + 0, + 4, + 4, + 3, + 5, + 3, + 3, + 0, + 3, + 4, + 0, + 4, + 3), + (0, + 5, + 0, + 5, + 0, + 3, + 0, + 2, + 0, + 4, + 4, + 3, + 5, + 2, + 4, + 3, + 3, + 3, + 4, + 4, + 4, + 3, + 5, + 3, + 5, + 3, + 3, + 1, + 4, + 0, + 4, + 3, + 3, + 0, + 3, + 3, + 0, + 4, + 4, + 4, + 4, + 5, + 4, + 3, + 3, + 5, + 5, + 3, + 2, + 3, + 1, + 2, + 3, + 2, + 0, + 1, + 0, + 0, + 3, + 2, + 2, + 4, + 4, + 3, + 1, + 5, + 0, + 4, + 0, + 3, + 0, + 4, + 3, + 1, + 3, + 2, + 1, + 0, + 3, + 3, + 0, + 3, + 3), + (0, + 4, + 0, + 5, + 0, + 5, + 0, + 4, + 0, + 4, + 5, + 5, + 5, + 3, + 4, + 3, + 3, + 2, + 5, + 4, + 4, + 3, + 5, + 3, + 5, + 3, + 4, + 0, + 4, + 3, + 4, + 4, + 3, + 2, + 4, + 4, + 3, + 4, + 5, + 4, + 4, + 5, + 5, + 0, + 3, + 5, + 5, + 4, + 1, + 3, + 3, + 2, + 3, + 3, + 1, + 3, + 1, + 0, + 4, + 3, + 1, + 4, + 4, + 3, + 4, + 5, + 0, + 4, + 0, + 2, + 0, + 4, + 3, + 4, + 4, + 3, + 3, + 0, + 4, + 0, + 0, + 5, + 5), + (0, + 4, + 0, + 4, + 0, + 5, + 0, + 1, + 1, + 3, + 3, + 4, + 4, + 3, + 4, + 1, + 3, + 0, + 5, + 1, + 3, + 0, + 3, + 1, + 3, + 1, + 1, + 0, + 3, + 0, + 3, + 3, + 4, + 0, + 4, + 3, + 0, + 4, + 4, + 4, + 3, + 4, + 4, + 0, + 3, + 5, + 4, + 1, + 0, + 3, + 0, + 0, + 2, + 3, + 0, + 3, + 1, + 0, + 3, + 1, + 0, + 3, + 2, + 1, + 3, + 5, + 0, + 3, + 0, + 1, + 0, + 3, + 2, + 3, + 3, + 4, + 4, + 0, + 2, + 2, + 0, + 4, + 4), + (2, + 4, + 0, + 5, + 0, + 4, + 0, + 3, + 0, + 4, + 5, + 5, + 4, + 3, + 5, + 3, + 5, + 3, + 5, + 3, + 5, + 2, + 5, + 3, + 4, + 3, + 3, + 4, + 3, + 4, + 5, + 3, + 2, + 1, + 5, + 4, + 3, + 2, + 3, + 4, + 5, + 3, + 4, + 1, + 2, + 5, + 4, + 3, + 0, + 3, + 3, + 0, + 3, + 2, + 0, + 2, + 3, + 0, + 4, + 1, + 0, + 3, + 4, + 3, + 3, + 5, + 0, + 3, + 0, + 1, + 0, + 4, + 5, + 5, + 5, + 4, + 3, + 0, + 4, + 2, + 0, + 3, + 5), + (0, + 5, + 0, + 4, + 0, + 4, + 0, + 2, + 0, + 5, + 4, + 3, + 4, + 3, + 4, + 3, + 3, + 3, + 4, + 3, + 4, + 2, + 5, + 3, + 5, + 3, + 4, + 1, + 4, + 3, + 4, + 4, + 4, + 0, + 3, + 5, + 0, + 4, + 4, + 4, + 4, + 5, + 3, + 1, + 3, + 4, + 5, + 3, + 3, + 3, + 3, + 3, + 3, + 3, + 0, + 2, + 2, + 0, + 3, + 3, + 2, + 4, + 3, + 3, + 3, + 5, + 3, + 4, + 1, + 3, + 3, + 5, + 3, + 2, + 0, + 0, + 0, + 0, + 4, + 3, + 1, + 3, + 3), + (0, + 1, + 0, + 3, + 0, + 3, + 0, + 1, + 0, + 1, + 3, + 3, + 3, + 2, + 3, + 3, + 3, + 0, + 3, + 0, + 0, + 0, + 3, + 1, + 3, + 0, + 0, + 0, + 2, + 2, + 2, + 3, + 0, + 0, + 3, + 2, + 0, + 1, + 2, + 4, + 1, + 3, + 3, + 0, + 0, + 3, + 3, + 3, + 0, + 1, + 0, + 0, + 2, + 1, + 0, + 0, + 3, + 0, + 3, + 1, + 0, + 3, + 0, + 0, + 1, + 3, + 0, + 2, + 0, + 1, + 0, + 3, + 3, + 1, + 3, + 3, + 0, + 0, + 1, + 1, + 0, + 3, + 3), + (0, + 2, + 0, + 3, + 0, + 2, + 1, + 4, + 0, + 2, + 2, + 3, + 1, + 1, + 3, + 1, + 1, + 0, + 2, + 0, + 3, + 1, + 2, + 3, + 1, + 3, + 0, + 0, + 1, + 0, + 4, + 3, + 2, + 3, + 3, + 3, + 1, + 4, + 2, + 3, + 3, + 3, + 3, + 1, + 0, + 3, + 1, + 4, + 0, + 1, + 1, + 0, + 1, + 2, + 0, + 1, + 1, + 0, + 1, + 1, + 0, + 3, + 1, + 3, + 2, + 2, + 0, + 1, + 0, + 0, + 0, + 2, + 3, + 3, + 3, + 1, + 0, + 0, + 0, + 0, + 0, + 2, + 3), + (0, + 5, + 0, + 4, + 0, + 5, + 0, + 2, + 0, + 4, + 5, + 5, + 3, + 3, + 4, + 3, + 3, + 1, + 5, + 4, + 4, + 2, + 4, + 4, + 4, + 3, + 4, + 2, + 4, + 3, + 5, + 5, + 4, + 3, + 3, + 4, + 3, + 3, + 5, + 5, + 4, + 5, + 5, + 1, + 3, + 4, + 5, + 3, + 1, + 4, + 3, + 1, + 3, + 3, + 0, + 3, + 3, + 1, + 4, + 3, + 1, + 4, + 5, + 3, + 3, + 5, + 0, + 4, + 0, + 3, + 0, + 5, + 3, + 3, + 1, + 4, + 3, + 0, + 4, + 0, + 1, + 5, + 3), + (0, + 5, + 0, + 5, + 0, + 4, + 0, + 2, + 0, + 4, + 4, + 3, + 4, + 3, + 3, + 3, + 3, + 3, + 5, + 4, + 4, + 4, + 4, + 4, + 4, + 5, + 3, + 3, + 5, + 2, + 4, + 4, + 4, + 3, + 4, + 4, + 3, + 3, + 4, + 4, + 5, + 5, + 3, + 3, + 4, + 3, + 4, + 3, + 3, + 4, + 3, + 3, + 3, + 3, + 1, + 2, + 2, + 1, + 4, + 3, + 3, + 5, + 4, + 4, + 3, + 4, + 0, + 4, + 0, + 3, + 0, + 4, + 4, + 4, + 4, + 4, + 1, + 0, + 4, + 2, + 0, + 2, + 4), + (0, + 4, + 0, + 4, + 0, + 3, + 0, + 1, + 0, + 3, + 5, + 2, + 3, + 0, + 3, + 0, + 2, + 1, + 4, + 2, + 3, + 3, + 4, + 1, + 4, + 3, + 3, + 2, + 4, + 1, + 3, + 3, + 3, + 0, + 3, + 3, + 0, + 0, + 3, + 3, + 3, + 5, + 3, + 3, + 3, + 3, + 3, + 2, + 0, + 2, + 0, + 0, + 2, + 0, + 0, + 2, + 0, + 0, + 1, + 0, + 0, + 3, + 1, + 2, + 2, + 3, + 0, + 3, + 0, + 2, + 0, + 4, + 4, + 3, + 3, + 4, + 1, + 0, + 3, + 0, + 0, + 2, + 4), + (0, + 0, + 0, + 4, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 1, + 0, + 2, + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 2, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 3, + 1, + 3, + 0, + 3, + 2, + 0, + 0, + 0, + 1, + 0, + 3, + 2, + 0, + 0, + 2, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 3, + 4, + 0, + 2, + 0, + 0, + 0, + 0, + 0, + 0, + 2), + (0, + 2, + 1, + 3, + 0, + 2, + 0, + 2, + 0, + 3, + 3, + 3, + 3, + 1, + 3, + 1, + 3, + 3, + 3, + 3, + 3, + 3, + 4, + 2, + 2, + 1, + 2, + 1, + 4, + 0, + 4, + 3, + 1, + 3, + 3, + 3, + 2, + 4, + 3, + 5, + 4, + 3, + 3, + 3, + 3, + 3, + 3, + 3, + 0, + 1, + 3, + 0, + 2, + 0, + 0, + 1, + 0, + 0, + 1, + 0, + 0, + 4, + 2, + 0, + 2, + 3, + 0, + 3, + 3, + 0, + 3, + 3, + 4, + 2, + 3, + 1, + 4, + 0, + 1, + 2, + 0, + 2, + 3), + (0, + 3, + 0, + 3, + 0, + 1, + 0, + 3, + 0, + 2, + 3, + 3, + 3, + 0, + 3, + 1, + 2, + 0, + 3, + 3, + 2, + 3, + 3, + 2, + 3, + 2, + 3, + 1, + 3, + 0, + 4, + 3, + 2, + 0, + 3, + 3, + 1, + 4, + 3, + 3, + 2, + 3, + 4, + 3, + 1, + 3, + 3, + 1, + 1, + 0, + 1, + 1, + 0, + 1, + 0, + 1, + 0, + 1, + 0, + 0, + 0, + 4, + 1, + 1, + 0, + 3, + 0, + 3, + 1, + 0, + 2, + 3, + 3, + 3, + 3, + 3, + 1, + 0, + 0, + 2, + 0, + 3, + 3), + (0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 3, + 0, + 2, + 0, + 3, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 3, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 3, + 0, + 3, + 0, + 3, + 1, + 0, + 1, + 0, + 1, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 3, + 0, + 2, + 0, + 2, + 3, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 3), + (0, + 2, + 0, + 3, + 1, + 3, + 0, + 3, + 0, + 2, + 3, + 3, + 3, + 1, + 3, + 1, + 3, + 1, + 3, + 1, + 3, + 3, + 3, + 1, + 3, + 0, + 2, + 3, + 1, + 1, + 4, + 3, + 3, + 2, + 3, + 3, + 1, + 2, + 2, + 4, + 1, + 3, + 3, + 0, + 1, + 4, + 2, + 3, + 0, + 1, + 3, + 0, + 3, + 0, + 0, + 1, + 3, + 0, + 2, + 0, + 0, + 3, + 3, + 2, + 1, + 3, + 0, + 3, + 0, + 2, + 0, + 3, + 4, + 4, + 4, + 3, + 1, + 0, + 3, + 0, + 0, + 3, + 3), + (0, + 2, + 0, + 1, + 0, + 2, + 0, + 0, + 0, + 1, + 3, + 2, + 2, + 1, + 3, + 0, + 1, + 1, + 3, + 0, + 3, + 2, + 3, + 1, + 2, + 0, + 2, + 0, + 1, + 1, + 3, + 3, + 3, + 0, + 3, + 3, + 1, + 1, + 2, + 3, + 2, + 3, + 3, + 1, + 2, + 3, + 2, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 3, + 0, + 1, + 0, + 0, + 2, + 1, + 2, + 1, + 3, + 0, + 3, + 0, + 0, + 0, + 3, + 4, + 4, + 4, + 3, + 2, + 0, + 2, + 0, + 0, + 2, + 4), + (0, + 0, + 0, + 1, + 0, + 1, + 0, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 2, + 2, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 1, + 3, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 3), + (0, + 3, + 0, + 3, + 0, + 2, + 0, + 3, + 0, + 3, + 3, + 3, + 2, + 3, + 2, + 2, + 2, + 0, + 3, + 1, + 3, + 3, + 3, + 2, + 3, + 3, + 0, + 0, + 3, + 0, + 3, + 2, + 2, + 0, + 2, + 3, + 1, + 4, + 3, + 4, + 3, + 3, + 2, + 3, + 1, + 5, + 4, + 4, + 0, + 3, + 1, + 2, + 1, + 3, + 0, + 3, + 1, + 1, + 2, + 0, + 2, + 3, + 1, + 3, + 1, + 3, + 0, + 3, + 0, + 1, + 0, + 3, + 3, + 4, + 4, + 2, + 1, + 0, + 2, + 1, + 0, + 2, + 4), + (0, + 1, + 0, + 3, + 0, + 1, + 0, + 2, + 0, + 1, + 4, + 2, + 5, + 1, + 4, + 0, + 2, + 0, + 2, + 1, + 3, + 1, + 4, + 0, + 2, + 1, + 0, + 0, + 2, + 1, + 4, + 1, + 1, + 0, + 3, + 3, + 0, + 5, + 1, + 3, + 2, + 3, + 3, + 1, + 0, + 3, + 2, + 3, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 4, + 0, + 1, + 0, + 3, + 0, + 2, + 0, + 1, + 0, + 3, + 3, + 3, + 4, + 3, + 3, + 0, + 0, + 0, + 0, + 2, + 3), + (0, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 2, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 3, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 2, + 1, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 3), + (0, + 1, + 0, + 3, + 0, + 4, + 0, + 3, + 0, + 2, + 4, + 3, + 1, + 0, + 3, + 2, + 2, + 1, + 3, + 1, + 2, + 2, + 3, + 1, + 1, + 1, + 2, + 1, + 3, + 0, + 1, + 2, + 0, + 1, + 3, + 2, + 1, + 3, + 0, + 5, + 5, + 1, + 0, + 0, + 1, + 3, + 2, + 1, + 0, + 3, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 3, + 4, + 0, + 1, + 1, + 1, + 3, + 2, + 0, + 2, + 0, + 1, + 0, + 2, + 3, + 3, + 1, + 2, + 3, + 0, + 1, + 0, + 1, + 0, + 4), + (0, + 0, + 0, + 1, + 0, + 3, + 0, + 3, + 0, + 2, + 2, + 1, + 0, + 0, + 4, + 0, + 3, + 0, + 3, + 1, + 3, + 0, + 3, + 0, + 3, + 0, + 1, + 0, + 3, + 0, + 3, + 1, + 3, + 0, + 3, + 3, + 0, + 0, + 1, + 2, + 1, + 1, + 1, + 0, + 1, + 2, + 0, + 0, + 0, + 1, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 2, + 2, + 1, + 2, + 0, + 0, + 2, + 0, + 0, + 0, + 0, + 2, + 3, + 3, + 3, + 3, + 0, + 0, + 0, + 0, + 1, + 4), + (0, + 0, + 0, + 3, + 0, + 3, + 0, + 0, + 0, + 0, + 3, + 1, + 1, + 0, + 3, + 0, + 1, + 0, + 2, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 3, + 0, + 2, + 0, + 2, + 3, + 0, + 0, + 2, + 2, + 3, + 1, + 2, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 3, + 0, + 0, + 2, + 0, + 0, + 0, + 0, + 2, + 3), + (2, + 4, + 0, + 5, + 0, + 5, + 0, + 4, + 0, + 3, + 4, + 3, + 3, + 3, + 4, + 3, + 3, + 3, + 4, + 3, + 4, + 4, + 5, + 4, + 5, + 5, + 5, + 2, + 3, + 0, + 5, + 5, + 4, + 1, + 5, + 4, + 3, + 1, + 5, + 4, + 3, + 4, + 4, + 3, + 3, + 4, + 3, + 3, + 0, + 3, + 2, + 0, + 2, + 3, + 0, + 3, + 0, + 0, + 3, + 3, + 0, + 5, + 3, + 2, + 3, + 3, + 0, + 3, + 0, + 3, + 0, + 3, + 4, + 5, + 4, + 5, + 3, + 0, + 4, + 3, + 0, + 3, + 4), + (0, + 3, + 0, + 3, + 0, + 3, + 0, + 3, + 0, + 3, + 3, + 4, + 3, + 2, + 3, + 2, + 3, + 0, + 4, + 3, + 3, + 3, + 3, + 3, + 3, + 3, + 3, + 0, + 3, + 2, + 4, + 3, + 3, + 1, + 3, + 4, + 3, + 4, + 4, + 4, + 3, + 4, + 4, + 3, + 2, + 4, + 4, + 1, + 0, + 2, + 0, + 0, + 1, + 1, + 0, + 2, + 0, + 0, + 3, + 1, + 0, + 5, + 3, + 2, + 1, + 3, + 0, + 3, + 0, + 1, + 2, + 4, + 3, + 2, + 4, + 3, + 3, + 0, + 3, + 2, + 0, + 4, + 4), + (0, + 3, + 0, + 3, + 0, + 1, + 0, + 0, + 0, + 1, + 4, + 3, + 3, + 2, + 3, + 1, + 3, + 1, + 4, + 2, + 3, + 2, + 4, + 2, + 3, + 4, + 3, + 0, + 2, + 2, + 3, + 3, + 3, + 0, + 3, + 3, + 3, + 0, + 3, + 4, + 1, + 3, + 3, + 0, + 3, + 4, + 3, + 3, + 0, + 1, + 1, + 0, + 1, + 0, + 0, + 0, + 4, + 0, + 3, + 0, + 0, + 3, + 1, + 2, + 1, + 3, + 0, + 4, + 0, + 1, + 0, + 4, + 3, + 3, + 4, + 3, + 3, + 0, + 2, + 0, + 0, + 3, + 3), + (0, + 3, + 0, + 4, + 0, + 1, + 0, + 3, + 0, + 3, + 4, + 3, + 3, + 0, + 3, + 3, + 3, + 1, + 3, + 1, + 3, + 3, + 4, + 3, + 3, + 3, + 0, + 0, + 3, + 1, + 5, + 3, + 3, + 1, + 3, + 3, + 2, + 5, + 4, + 3, + 3, + 4, + 5, + 3, + 2, + 5, + 3, + 4, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 2, + 0, + 0, + 1, + 1, + 0, + 4, + 2, + 2, + 1, + 3, + 0, + 3, + 0, + 2, + 0, + 4, + 4, + 3, + 5, + 3, + 2, + 0, + 1, + 1, + 0, + 3, + 4), + (0, + 5, + 0, + 4, + 0, + 5, + 0, + 2, + 0, + 4, + 4, + 3, + 3, + 2, + 3, + 3, + 3, + 1, + 4, + 3, + 4, + 1, + 5, + 3, + 4, + 3, + 4, + 0, + 4, + 2, + 4, + 3, + 4, + 1, + 5, + 4, + 0, + 4, + 4, + 4, + 4, + 5, + 4, + 1, + 3, + 5, + 4, + 2, + 1, + 4, + 1, + 1, + 3, + 2, + 0, + 3, + 1, + 0, + 3, + 2, + 1, + 4, + 3, + 3, + 3, + 4, + 0, + 4, + 0, + 3, + 0, + 4, + 4, + 4, + 3, + 3, + 3, + 0, + 4, + 2, + 0, + 3, + 4), + (1, + 4, + 0, + 4, + 0, + 3, + 0, + 1, + 0, + 3, + 3, + 3, + 1, + 1, + 3, + 3, + 2, + 2, + 3, + 3, + 1, + 0, + 3, + 2, + 2, + 1, + 2, + 0, + 3, + 1, + 2, + 1, + 2, + 0, + 3, + 2, + 0, + 2, + 2, + 3, + 3, + 4, + 3, + 0, + 3, + 3, + 1, + 2, + 0, + 1, + 1, + 3, + 1, + 2, + 0, + 0, + 3, + 0, + 1, + 1, + 0, + 3, + 2, + 2, + 3, + 3, + 0, + 3, + 0, + 0, + 0, + 2, + 3, + 3, + 4, + 3, + 3, + 0, + 1, + 0, + 0, + 1, + 4), + (0, + 4, + 0, + 4, + 0, + 4, + 0, + 0, + 0, + 3, + 4, + 4, + 3, + 1, + 4, + 2, + 3, + 2, + 3, + 3, + 3, + 1, + 4, + 3, + 4, + 0, + 3, + 0, + 4, + 2, + 3, + 3, + 2, + 2, + 5, + 4, + 2, + 1, + 3, + 4, + 3, + 4, + 3, + 1, + 3, + 3, + 4, + 2, + 0, + 2, + 1, + 0, + 3, + 3, + 0, + 0, + 2, + 0, + 3, + 1, + 0, + 4, + 4, + 3, + 4, + 3, + 0, + 4, + 0, + 1, + 0, + 2, + 4, + 4, + 4, + 4, + 4, + 0, + 3, + 2, + 0, + 3, + 3), + (0, + 0, + 0, + 1, + 0, + 4, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 3, + 2, + 0, + 0, + 1, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 2), + (0, + 2, + 0, + 3, + 0, + 4, + 0, + 4, + 0, + 1, + 3, + 3, + 3, + 0, + 4, + 0, + 2, + 1, + 2, + 1, + 1, + 1, + 2, + 0, + 3, + 1, + 1, + 0, + 1, + 0, + 3, + 1, + 0, + 0, + 3, + 3, + 2, + 0, + 1, + 1, + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 2, + 0, + 2, + 2, + 0, + 3, + 1, + 0, + 0, + 1, + 0, + 1, + 1, + 0, + 1, + 2, + 0, + 3, + 0, + 0, + 0, + 0, + 1, + 0, + 0, + 3, + 3, + 4, + 3, + 1, + 0, + 1, + 0, + 3, + 0, + 2), + (0, + 0, + 0, + 3, + 0, + 5, + 0, + 0, + 0, + 0, + 1, + 0, + 2, + 0, + 3, + 1, + 0, + 1, + 3, + 0, + 0, + 0, + 2, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 1, + 1, + 0, + 0, + 4, + 0, + 0, + 0, + 2, + 3, + 0, + 1, + 4, + 1, + 0, + 2, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 3, + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 2, + 0, + 0, + 3, + 0, + 0, + 0, + 0, + 0, + 3), + (0, + 2, + 0, + 5, + 0, + 5, + 0, + 1, + 0, + 2, + 4, + 3, + 3, + 2, + 5, + 1, + 3, + 2, + 3, + 3, + 3, + 0, + 4, + 1, + 2, + 0, + 3, + 0, + 4, + 0, + 2, + 2, + 1, + 1, + 5, + 3, + 0, + 0, + 1, + 4, + 2, + 3, + 2, + 0, + 3, + 3, + 3, + 2, + 0, + 2, + 4, + 1, + 1, + 2, + 0, + 1, + 1, + 0, + 3, + 1, + 0, + 1, + 3, + 1, + 2, + 3, + 0, + 2, + 0, + 0, + 0, + 1, + 3, + 5, + 4, + 4, + 4, + 0, + 3, + 0, + 0, + 1, + 3), + (0, + 4, + 0, + 5, + 0, + 4, + 0, + 4, + 0, + 4, + 5, + 4, + 3, + 3, + 4, + 3, + 3, + 3, + 4, + 3, + 4, + 4, + 5, + 3, + 4, + 5, + 4, + 2, + 4, + 2, + 3, + 4, + 3, + 1, + 4, + 4, + 1, + 3, + 5, + 4, + 4, + 5, + 5, + 4, + 4, + 5, + 5, + 5, + 2, + 3, + 3, + 1, + 4, + 3, + 1, + 3, + 3, + 0, + 3, + 3, + 1, + 4, + 3, + 4, + 4, + 4, + 0, + 3, + 0, + 4, + 0, + 3, + 3, + 4, + 4, + 5, + 0, + 0, + 4, + 3, + 0, + 4, + 5), + (0, + 4, + 0, + 4, + 0, + 3, + 0, + 3, + 0, + 3, + 4, + 4, + 4, + 3, + 3, + 2, + 4, + 3, + 4, + 3, + 4, + 3, + 5, + 3, + 4, + 3, + 2, + 1, + 4, + 2, + 4, + 4, + 3, + 1, + 3, + 4, + 2, + 4, + 5, + 5, + 3, + 4, + 5, + 4, + 1, + 5, + 4, + 3, + 0, + 3, + 2, + 2, + 3, + 2, + 1, + 3, + 1, + 0, + 3, + 3, + 3, + 5, + 3, + 3, + 3, + 5, + 4, + 4, + 2, + 3, + 3, + 4, + 3, + 3, + 3, + 2, + 1, + 0, + 3, + 2, + 1, + 4, + 3), + (0, + 4, + 0, + 5, + 0, + 4, + 0, + 3, + 0, + 3, + 5, + 5, + 3, + 2, + 4, + 3, + 4, + 0, + 5, + 4, + 4, + 1, + 4, + 4, + 4, + 3, + 3, + 3, + 4, + 3, + 5, + 5, + 2, + 3, + 3, + 4, + 1, + 2, + 5, + 5, + 3, + 5, + 5, + 2, + 3, + 5, + 5, + 4, + 0, + 3, + 2, + 0, + 3, + 3, + 1, + 1, + 5, + 1, + 4, + 1, + 0, + 4, + 3, + 2, + 3, + 5, + 0, + 4, + 0, + 3, + 0, + 5, + 4, + 3, + 4, + 3, + 0, + 0, + 4, + 1, + 0, + 4, + 4), + (1, + 3, + 0, + 4, + 0, + 2, + 0, + 2, + 0, + 2, + 5, + 5, + 3, + 3, + 3, + 3, + 3, + 0, + 4, + 2, + 3, + 4, + 4, + 4, + 3, + 4, + 0, + 0, + 3, + 4, + 5, + 4, + 3, + 3, + 3, + 3, + 2, + 5, + 5, + 4, + 5, + 5, + 5, + 4, + 3, + 5, + 5, + 5, + 1, + 3, + 1, + 0, + 1, + 0, + 0, + 3, + 2, + 0, + 4, + 2, + 0, + 5, + 2, + 3, + 2, + 4, + 1, + 3, + 0, + 3, + 0, + 4, + 5, + 4, + 5, + 4, + 3, + 0, + 4, + 2, + 0, + 5, + 4), + (0, + 3, + 0, + 4, + 0, + 5, + 0, + 3, + 0, + 3, + 4, + 4, + 3, + 2, + 3, + 2, + 3, + 3, + 3, + 3, + 3, + 2, + 4, + 3, + 3, + 2, + 2, + 0, + 3, + 3, + 3, + 3, + 3, + 1, + 3, + 3, + 3, + 0, + 4, + 4, + 3, + 4, + 4, + 1, + 1, + 4, + 4, + 2, + 0, + 3, + 1, + 0, + 1, + 1, + 0, + 4, + 1, + 0, + 2, + 3, + 1, + 3, + 3, + 1, + 3, + 4, + 0, + 3, + 0, + 1, + 0, + 3, + 1, + 3, + 0, + 0, + 1, + 0, + 2, + 0, + 0, + 4, + 4), + (0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0), + (0, + 3, + 0, + 3, + 0, + 2, + 0, + 3, + 0, + 1, + 5, + 4, + 3, + 3, + 3, + 1, + 4, + 2, + 1, + 2, + 3, + 4, + 4, + 2, + 4, + 4, + 5, + 0, + 3, + 1, + 4, + 3, + 4, + 0, + 4, + 3, + 3, + 3, + 2, + 3, + 2, + 5, + 3, + 4, + 3, + 2, + 2, + 3, + 0, + 0, + 3, + 0, + 2, + 1, + 0, + 1, + 2, + 0, + 0, + 0, + 0, + 2, + 1, + 1, + 3, + 1, + 0, + 2, + 0, + 4, + 0, + 3, + 4, + 4, + 4, + 5, + 2, + 0, + 2, + 0, + 0, + 1, + 3), + (0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 0, + 0, + 1, + 1, + 0, + 0, + 0, + 4, + 2, + 1, + 1, + 0, + 1, + 0, + 3, + 2, + 0, + 0, + 3, + 1, + 1, + 1, + 2, + 2, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 3, + 0, + 1, + 0, + 0, + 0, + 2, + 0, + 0, + 0, + 1, + 4, + 0, + 4, + 2, + 1, + 0, + 0, + 0, + 0, + 0, + 1), + (0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 1, + 0, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 1, + 0, + 0, + 0, + 0, + 3, + 1, + 0, + 0, + 0, + 2, + 0, + 2, + 1, + 0, + 0, + 1, + 2, + 1, + 0, + 1, + 1, + 0, + 0, + 3, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 3, + 1, + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 0, + 2, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 2), + (0, + 4, + 0, + 4, + 0, + 4, + 0, + 3, + 0, + 4, + 4, + 3, + 4, + 2, + 4, + 3, + 2, + 0, + 4, + 4, + 4, + 3, + 5, + 3, + 5, + 3, + 3, + 2, + 4, + 2, + 4, + 3, + 4, + 3, + 1, + 4, + 0, + 2, + 3, + 4, + 4, + 4, + 3, + 3, + 3, + 4, + 4, + 4, + 3, + 4, + 1, + 3, + 4, + 3, + 2, + 1, + 2, + 1, + 3, + 3, + 3, + 4, + 4, + 3, + 3, + 5, + 0, + 4, + 0, + 3, + 0, + 4, + 3, + 3, + 3, + 2, + 1, + 0, + 3, + 0, + 0, + 3, + 3), + (0, + 4, + 0, + 3, + 0, + 3, + 0, + 3, + 0, + 3, + 5, + 5, + 3, + 3, + 3, + 3, + 4, + 3, + 4, + 3, + 3, + 3, + 4, + 4, + 4, + 3, + 3, + 3, + 3, + 4, + 3, + 5, + 3, + 3, + 1, + 3, + 2, + 4, + 5, + 5, + 5, + 5, + 4, + 3, + 4, + 5, + 5, + 3, + 2, + 2, + 3, + 3, + 3, + 3, + 2, + 3, + 3, + 1, + 2, + 3, + 2, + 4, + 3, + 3, + 3, + 4, + 0, + 4, + 0, + 2, + 0, + 4, + 3, + 2, + 2, + 1, + 2, + 0, + 3, + 0, + 0, + 4, + 1)) + +class JapaneseContextAnalysis(): + + def __init__(self): + self.reset() + + def reset(self): + self._mTotalRel = 0 + self._mRelSample = [0] * NUM_OF_CATEGORY + self._mNeedToSkipCharNum = 0 + self._mLastCharOrder = -1 + self._mDone = False + + def feed(self, aBuf, aLen): + if self._mDone: + return + i = self._mNeedToSkipCharNum + while i < aLen: + order, charLen = self.get_order(aBuf[i:i + 2]) + i += charLen + if i > aLen: + self._mNeedToSkipCharNum = i - aLen + self._mLastCharOrder = -1 + else: + if order != -1 and self._mLastCharOrder != -1: + self._mTotalRel += 1 + if self._mTotalRel > MAX_REL_THRESHOLD: + self._mDone = True + break + self._mRelSample[jp2CharContext[self._mLastCharOrder][order]] += 1 + self._mLastCharOrder = order + + def got_enough_data(self): + return self._mTotalRel > ENOUGH_REL_THRESHOLD + + def get_confidence(self): + if self._mTotalRel > MINIMUM_DATA_THRESHOLD: + return (self._mTotalRel - self._mRelSample[0]) / self._mTotalRel + else: + return DONT_KNOW + + def get_order(self, aBuf): + return (-1, 1) + + +class SJISContextAnalysis(JapaneseContextAnalysis): + + def __init__(self): + self.charset_name = 'SHIFT_JIS' + + def get_charset_name(self): + return self.charset_name + + def get_order(self, aBuf): + if not aBuf: + return (-1, 1) + first_char = wrap_ord(aBuf[0]) + if 129 <= first_char <= 159 or 224 <= first_char <= 252: + charLen = 2 + if first_char == 135 or 250 <= first_char <= 252: + self.charset_name = 'CP932' + else: + charLen = 1 + if len(aBuf) > 1: + second_char = wrap_ord(aBuf[1]) + if first_char == 202 and 159 <= second_char <= 241: + return (second_char - 159, charLen) + return (-1, charLen) + + +class EUCJPContextAnalysis(JapaneseContextAnalysis): + + def get_order(self, aBuf): + if not aBuf: + return (-1, 1) + first_char = wrap_ord(aBuf[0]) + if first_char == 142 or 161 <= first_char <= 254: + charLen = 2 + elif first_char == 143: + charLen = 3 + else: + charLen = 1 + if len(aBuf) > 1: + second_char = wrap_ord(aBuf[1]) + if first_char == 164 and 161 <= second_char <= 243: + return (second_char - 161, charLen) + return (-1, charLen) diff --git a/spacecomponents/client/ui/jumpbridge/bracketPanel.py b/spacecomponents/client/ui/jumpbridge/bracketPanel.py @@ -12,7 +12,7 @@ from spacecomponents.client.ui.rootTransformController import PanelTransformCont class JumpBridgePanel(BracketPanel): - def __init__(self, parent, camera, root_transform, content_class, panel_name, offset_y, collapse_at_camera_distance, tether_name, tether_width, on_focus = None, itemID = None, typeID = None): + def __init__(self, parent, camera, root_transform, content_class, panel_name, offset_y, collapse_at_camera_distance, tether_name, tether_width, on_focus = None, itemID = None, typeID = None, hide_interaction_point_at_camera_distance = 600000.0): self._camera = camera self._root_transform = root_transform self._content_class = content_class @@ -22,6 +22,7 @@ class JumpBridgePanel(BracketPanel): self.playerRequestedCollapseToken = None self.on_collapse_changed = Signal('on_collapse_changed') self._panel_transform = PanelTransformController(root=root_transform, camera=camera, offset_y=offset_y) + self._hide_interaction_point_at_camera_distance = hide_interaction_point_at_camera_distance super(JumpBridgePanel, self).__init__(name=panel_name, transform=self._panel_transform.transform, layer=parent, camera=camera, collapse_at_camera_distance=collapse_at_camera_distance, clipping_dead_zone=50, on_focus=on_focus, collapsed=True) self._base = ContainerAutoSize(name='%s_base' % panel_name, alignMode=uiconst.CENTERBOTTOM) self._main_content = ContainerAutoSize(name='_main_content', parent=self._base, align=uiconst.CENTERBOTTOM, alignMode=uiconst.CENTERBOTTOM) @@ -95,3 +96,20 @@ class JumpBridgePanel(BracketPanel): def _on_close_point_click(self): self.playerRequestedCollapseToken = self.request_collapse(Priority.control_point) + + def _update_interaction_point_in_frame(self): + try: + if self._hide_interaction_point_at_camera_distance is None: + return + if not self._camera.is_valid: + return + if not self._tether or self._tether.destroyed: + return + camera_distance = self._camera.distance_from_transform(self._transform) + out_of_range = camera_distance > self._hide_interaction_point_at_camera_distance + if out_of_range: + self._tether.hide_interaction_point() + else: + self._tether.show_interaction_point() + except Exception as e: + pass diff --git a/threadutils/scheduler.py b/threadutils/scheduler.py @@ -125,7 +125,7 @@ class Scheduler(object): self._start_worker() def _start_worker(self): - self.worker_thread = uthread2.start_tasklet(self.run) + self.worker_thread = uthread2.start_tasklet(self.run, stackless_tracing_enabled=False) def _stop_worker(self): if self.worker_thread is None: