Unverified Commit ca8b95e7 authored by Mikhail Paulyshka's avatar Mikhail Paulyshka
Browse files

py_macro,xpm: remove BOB

parent fcb4bac9

release/configs/py_macro/xvm/hitLog.py

+1 −2
Changes for release/configs/py_macro/xvm/hitLog.py: 1 added line, 2 removed lines.
Original line number Diff line number Diff line
@@ -46,8 +46,7 @@ BATTLE_TYPE = {ARENA_GUI_TYPE.UNKNOWN: "unknown", 
               ARENA_GUI_TYPE.EPIC_RANDOM_TRAINING: "epic_random_training",

               ARENA_GUI_TYPE.EPIC_BATTLE: "epic_battle",

               ARENA_GUI_TYPE.EPIC_TRAINING: "epic_battle",

               ARENA_GUI_TYPE.BATTLE_ROYALE: "battle_royale",

               ARENA_GUI_TYPE.BOB: 'bob'}

               ARENA_GUI_TYPE.BATTLE_ROYALE: "battle_royale"}



HIT_LOG = 'hitLog/'

FORMAT_HISTORY = 'formatHistory'

src/xpm/xvm_battle/battle.py

+1 −2
Changes for src/xpm/xvm_battle/battle.py: 1 added line, 2 removed lines.
Original line number Diff line number Diff line
@@ -51,8 +51,7 @@ import xmqp_events 
NOT_SUPPORTED_BATTLE_TYPES = [constants.ARENA_GUI_TYPE.TUTORIAL,

                           constants.ARENA_GUI_TYPE.EVENT_BATTLES,

                           constants.ARENA_GUI_TYPE.BOOTCAMP,

                           constants.ARENA_GUI_TYPE.BATTLE_ROYALE,

                           constants.ARENA_GUI_TYPE.BOB]

                           constants.ARENA_GUI_TYPE.BATTLE_ROYALE]



#####################################################################

# initialization/finalization

src/xpm/xvm_tankcarousel/filter_popover.py

+4 −4
Changes for src/xpm/xvm_tankcarousel/filter_popover.py: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ import simplejson 


import constants

from account_helpers.AccountSettings import AccountSettings, DEFAULT_VALUES, KEY_FILTERS

from account_helpers.AccountSettings import CAROUSEL_FILTER_2, RANKED_CAROUSEL_FILTER_2, EPICBATTLE_CAROUSEL_FILTER_2, ROYALE_CAROUSEL_FILTER_2, BOB_CAROUSEL_FILTER_2

from account_helpers.AccountSettings import CAROUSEL_FILTER_CLIENT_1, RANKED_CAROUSEL_FILTER_CLIENT_1, EPICBATTLE_CAROUSEL_FILTER_CLIENT_1, BATTLEPASS_CAROUSEL_FILTER_CLIENT_1, ROYALE_CAROUSEL_FILTER_CLIENT_1, BOB_CAROUSEL_FILTER_CLIENT_1

from account_helpers.AccountSettings import CAROUSEL_FILTER_2, RANKED_CAROUSEL_FILTER_2, EPICBATTLE_CAROUSEL_FILTER_2, ROYALE_CAROUSEL_FILTER_2

from account_helpers.AccountSettings import CAROUSEL_FILTER_CLIENT_1, RANKED_CAROUSEL_FILTER_CLIENT_1, EPICBATTLE_CAROUSEL_FILTER_CLIENT_1, BATTLEPASS_CAROUSEL_FILTER_CLIENT_1, ROYALE_CAROUSEL_FILTER_CLIENT_1

from account_helpers.settings_core.ServerSettingsManager import ServerSettingsManager

from gui.shared.gui_items.dossier.achievements import MarkOfMasteryAchievement

from gui.shared.utils.functions import makeTooltip
@@ -54,7 +54,7 @@ class PREFS(object): 
class USERPREFS(object):

    CAROUSEL_FILTERS = "users/{accountDBID}/tankcarousel/filters"



_SUPPORTED_SECTIONS = (CAROUSEL_FILTER_2, RANKED_CAROUSEL_FILTER_2, EPICBATTLE_CAROUSEL_FILTER_2, ROYALE_CAROUSEL_FILTER_2, BOB_CAROUSEL_FILTER_2)

_SUPPORTED_SECTIONS = (CAROUSEL_FILTER_2, RANKED_CAROUSEL_FILTER_2, EPICBATTLE_CAROUSEL_FILTER_2, ROYALE_CAROUSEL_FILTER_2)



#####################################################################

# initialization/finalization
@@ -94,7 +94,7 @@ def _ServerSettingsManager_setSections(base, self, sections, settings): 


@overrideStaticMethod(AccountSettings, 'setFilter')

def _AccountSettings_setFilter(base, name, value):

    if name in (CAROUSEL_FILTER_CLIENT_1, RANKED_CAROUSEL_FILTER_CLIENT_1, EPICBATTLE_CAROUSEL_FILTER_CLIENT_1, BATTLEPASS_CAROUSEL_FILTER_CLIENT_1, ROYALE_CAROUSEL_FILTER_CLIENT_1, BOB_CAROUSEL_FILTER_CLIENT_1):

    if name in (CAROUSEL_FILTER_CLIENT_1, RANKED_CAROUSEL_FILTER_CLIENT_1, EPICBATTLE_CAROUSEL_FILTER_CLIENT_1, BATTLEPASS_CAROUSEL_FILTER_CLIENT_1, ROYALE_CAROUSEL_FILTER_CLIENT_1):

        value = {key: value for key, value in value.iteritems() if key not in PREFS.XVM_KEYS}

    base(name, value)