From ed1e8fa552efbc79775611b0daf15cacc04617fb Mon Sep 17 00:00:00 2001 From: Brandon Rodriguez <brodriguez8774@gmail.com> Date: Tue, 11 Aug 2020 00:21:07 -0400 Subject: [PATCH] Correct some weapons filtering for endgame --- resources/parsers/weapons.py | 76 ++++++++++++++++++++++++------------ 1 file changed, 52 insertions(+), 24 deletions(-) diff --git a/resources/parsers/weapons.py b/resources/parsers/weapons.py index 18bf836..13f5a2f 100644 --- a/resources/parsers/weapons.py +++ b/resources/parsers/weapons.py @@ -83,11 +83,17 @@ class WeaponParser(): """ drop_level = filter_dict['base_drop_level'] + (filter_dict['level_rarity_modifier'] * 2) - self.template.rare_item( - base_text=item['Name'], - background_color=display_dict['dark_grey_background'], - item_level='<= {0}'.format(item['DropLevel'] + drop_level), - ) + if item['MaxLevel'] is True: + self.template.rare_item( + base_text=item['Name'], + background_color=display_dict['dark_grey_background'], + ) + else: + self.template.rare_item( + base_text=item['Name'], + background_color=display_dict['dark_grey_background'], + item_level='<= {0}'.format(item['DropLevel'] + drop_level), + ) def parse_item_max_slot(self, item): """ @@ -128,15 +134,25 @@ class WeaponParser(): """ drop_level = filter_dict['base_drop_level'] - self.template.common_item( - description='Linked RGB Type', - base_text=item['Name'], - item_level='<= {0}'.format(item['DropLevel'] + drop_level), - socket_group='"RGB"', - background_color=display_dict['dark_grey_background'], - border_color=display_dict['normal'], - font_size=display_dict['uncommon_font_size'], - ) + if item['MaxLevel'] is True: + self.template.common_item( + description='Linked RGB Type', + base_text=item['Name'], + socket_group='"RGB"', + background_color=display_dict['dark_grey_background'], + border_color=display_dict['normal'], + font_size=display_dict['uncommon_font_size'], + ) + else: + self.template.common_item( + description='Linked RGB Type', + base_text=item['Name'], + item_level='<= {0}'.format(item['DropLevel'] + drop_level), + socket_group='"RGB"', + background_color=display_dict['dark_grey_background'], + border_color=display_dict['normal'], + font_size=display_dict['uncommon_font_size'], + ) def parse_item_uncommon(self, item): """ @@ -145,11 +161,17 @@ class WeaponParser(): """ drop_level = filter_dict['base_drop_level'] + filter_dict['level_rarity_modifier'] - self.template.uncommon_item( - base_text=item['Name'], - background_color=display_dict['dark_grey_background'], - item_level='<= {0}'.format(item['DropLevel'] + drop_level), - ) + if item['MaxLevel'] is True: + self.template.uncommon_item( + base_text=item['Name'], + background_color=display_dict['dark_grey_background'], + ) + else: + self.template.uncommon_item( + base_text=item['Name'], + background_color=display_dict['dark_grey_background'], + item_level='<= {0}'.format(item['DropLevel'] + drop_level), + ) def parse_item_base(self, item): """ @@ -158,11 +180,17 @@ class WeaponParser(): """ drop_level = filter_dict['base_drop_level'] - self.template.common_item( - base_text=item['Name'], - background_color=display_dict['dark_grey_background'], - item_level='<= {0}'.format(item['DropLevel'] + drop_level), - ) + if item['MaxLevel'] is True: + self.template.common_item( + base_text=item['Name'], + background_color=display_dict['dark_grey_background'], + ) + else: + self.template.common_item( + base_text=item['Name'], + background_color=display_dict['dark_grey_background'], + item_level='<= {0}'.format(item['DropLevel'] + drop_level), + ) def parse_bows(self): """ -- GitLab