diff --git a/assets/share/character/switch/TrailblazerHarmonyFemale.png b/assets/share/character/switch/TrailblazerHarmonyFemale.png new file mode 100644 index 000000000..3c15beea0 Binary files /dev/null and b/assets/share/character/switch/TrailblazerHarmonyFemale.png differ diff --git a/assets/share/character/switch/TrailblazerHarmonyMale.png b/assets/share/character/switch/TrailblazerHarmonyMale.png new file mode 100644 index 000000000..ed68ea8f4 Binary files /dev/null and b/assets/share/character/switch/TrailblazerHarmonyMale.png differ diff --git a/tasks/character/assets/assets_character_switch.py b/tasks/character/assets/assets_character_switch.py index ac038f031..54a4ee551 100644 --- a/tasks/character/assets/assets_character_switch.py +++ b/tasks/character/assets/assets_character_switch.py @@ -63,6 +63,26 @@ TrailblazerDestructionMale = ButtonWrapper( button=(1169, 156, 1187, 174), ), ) +TrailblazerHarmonyFemale = ButtonWrapper( + name='TrailblazerHarmonyFemale', + share=Button( + file='./assets/share/character/switch/TrailblazerHarmonyFemale.png', + area=(1174, 242, 1192, 260), + search=(1154, 222, 1212, 280), + color=(197, 165, 158), + button=(1174, 242, 1192, 260), + ), +) +TrailblazerHarmonyMale = ButtonWrapper( + name='TrailblazerHarmonyMale', + share=Button( + file='./assets/share/character/switch/TrailblazerHarmonyMale.png', + area=(1175, 321, 1193, 339), + search=(1155, 301, 1213, 359), + color=(181, 152, 147), + button=(1175, 321, 1193, 339), + ), +) TrailblazerPreservationFemale = ButtonWrapper( name='TrailblazerPreservationFemale', share=Button( diff --git a/tasks/character/switch.py b/tasks/character/switch.py index bf5e750af..22e1790b9 100644 --- a/tasks/character/switch.py +++ b/tasks/character/switch.py @@ -22,6 +22,7 @@ class OcrCharacterName(OcrWhiteLetterOnComplexBackground): result = result.replace('蛆', '妲') # Dan Heng o.ImbibitorLunae result = re.sub(r'[0Oo\-. ]{1,3}Imbi', 'Imbi', result) + result = result.replace('舟恒', '丹恒') result = re.sub(r'院.?梅', '阮•梅', result) @@ -98,6 +99,10 @@ class CharacterSwitch(UI): TrailblazerPreservationFemale, ], + KEYWORDS_CHARACTER_LIST.TrailblazerHarmony: [ + TrailblazerHarmonyMale, + TrailblazerHarmonyFemale, + ], KEYWORDS_CHARACTER_LIST.Huohuo: [Huohuo], KEYWORDS_CHARACTER_LIST.FuXuan: [FuXuan], }