Merge pull request #6 from MrrDevils/designant-support

Add support for parsing and rendering Designant.'s "red" arcs and arctaps

Author: zhanbao2000

ArcaeaChartRender/aff/token.py

@@ -29,7 +29,8 @@ class Value(object):
         class SkyLine(object):
             true = 'true'
             false = 'false'
-            all = [true, false]
+            designant = 'designant'
+            all = [true, false, designant]
 
         class HitSound(object):
             none = 'none'

ArcaeaChartRender/element.py

@@ -17,7 +17,7 @@
 
 from abc import ABC, abstractmethod
 from itertools import chain
-from typing import Union, Optional, Type, TypeVar, Iterator, Iterable
+from typing import Union, Optional, Type, TypeVar, Iterator, Iterable, Literal
 
 from .aff.token import AffToken, Color
 from .utils import len_iter
@@ -320,15 +320,17 @@ def __init__(
         self.hit_sound = hit_sound
         # Regardless of the value of is_skyline,
         # as long as arctap_list exists, then it must be skyline.
-        self.is_skyline = {
+        self.is_skyline: bool | Literal['Designant'] = {
                               AffToken.Value.SkyLine.true: True,
-                              AffToken.Value.SkyLine.false: False
+                              AffToken.Value.SkyLine.false: False,
+                              AffToken.Value.SkyLine.designant: 'Designant'
                           }[is_skyline] or bool(arctap_list)
         self.arctap_list = arctap_list
 
     def __repr__(self):
         pos = f'from ({self.x1}, {self.y1}) to ({self.x2}, {self.y2})'
-        if self.is_skyline:
+        color: Color | Literal['Designant'] = self.color
+        if self.is_skyline is True:
             if self.arctap_list:
                 literal_arctap_list = ', with arctap: ' + ' '.join(map(lambda _: str(_.tn), self.arctap_list))
             else:
@@ -337,7 +339,9 @@ def __repr__(self):
                 f'[{self.t1} -> {self.t2} Skyline] {pos}'
                 f'{literal_arctap_list}'
             )
-        return f'[{self.t1} -> {self.t2} {self.color} Arc] {pos}'
+        elif self.is_skyline == 'Designant':
+            color = 'Designant'
+        return f'[{self.t1} -> {self.t2} {color} Arc] {pos}'
 
     def __eq__(self, other):
         return all([
@@ -607,7 +611,7 @@ def get_combo_of(self, type_: Type['Note']):
         Return 0 if 'type_list' contains 'noinput'.
         """
         return 0 if 'noinput' in self.type_list else super().get_combo_of(type_)
-    
+
     def get_total_combo_before(self, t: int) -> int:
         """
         Return the total combo before given time.

ArcaeaChartRender/render.py

@@ -162,7 +162,7 @@ def __init__(self, aff_path: str, cover_path: str, song: Song, difficulty: int,
         self._render()
 
     def _render(self):
-        self.theme = LightTheme if self._song.side == 0 else ConflictTheme
+        self.theme = ConflictTheme if self._song.side == 1 else LightTheme  # for Colorless and Lephon
         self.im = Image.new('RGBA', (width_track + additional_canvas_width, self.h), self.theme.transparent_color)
 
         self._draw_track_tile()
@@ -277,18 +277,25 @@ def _draw_note_hold(self):
             t = hold.t1 // resize
             self.im.alpha_composite(im_stretched_hold, (int(x), Coordinate.from_cartesian(self.h, t, stretched_height_hold)))
 
+
     def _draw_arc_tap(self):
         """Draw all ArcTaps on skyline."""
         im_arctap = Image.open(self.theme.arctap_path).convert('RGBA').resize((width_arctap, height_arctap))
         im_arctap_sfx = Image.open(self.theme.arctap_sfx_path).convert('RGBA')
         im_arctap_sfx = im_arctap_sfx.resize((width_arctap, height_arctap))
+        im_arctap_designant = Image.open(self.theme.arctap_designant_path).convert(
+            'RGBA').resize((width_arctap, height_arctap))
+
+        def skyline_or_designant(arc: Arc) -> Image.Image:
+            return im_arctap if arc.is_skyline is True else im_arctap_designant
+
         for arc in self._chart.get_command_list_for_type(Arc, search_in_timing_group=True, exclude_noinput=False):
             sample = Sample(arc)
             which_im_arctap = {
                 AffToken.Value.HitSound.glass_wav: im_arctap_sfx,
                 AffToken.Value.HitSound.voice_wav: im_arctap_sfx,
                 AffToken.Value.HitSound.kick_wav: im_arctap_sfx,
-            }.get(arc.hit_sound, im_arctap)
+            }.get(arc.hit_sound, skyline_or_designant(arc))
             for arctap in arc.arctap_list:  # An Arc with an empty arctap_list will be automatically skipped.
                 x, z = Coordinate.from_normalized(sample.get_coordinate_tuple(arctap.tn))
                 t = arctap.tn // resize
@@ -321,8 +328,10 @@ def _draw_arc(self):
                     Color.Green: (im_arc_green, self.theme.arc_green_color),
                 }.get(arc.color)
                 thickness = self.theme.thickness_arc
-            elif arc.is_skyline:
+            elif arc.is_skyline is True:
                 im, color, thickness = im_arc_skyline, self.theme.arc_skyline_color, self.theme.thickness_skyline
+            elif arc.is_skyline == 'Designant':
+                im, color, thickness = im_arc_skyline, self.theme.arc_designant_color, self.theme.thickness_skyline
             else:
                 raise TypeError(f'Unsupported arc type: {arc}')
             # draw arc or skyline

ArcaeaChartRender/theme.py

@@ -64,8 +64,10 @@ class BaseTheme(ABC):
     arc_green_color = (35, 255, 108)
     arc_alpha = (0, 0, 0)  # for arc whose color is Color.Alpha (like PRAGMATISM BYD)
     arc_skyline_color = (144, 138, 144)
+    arc_designant_color = (201, 46, 22)
     text_song_title_color = (222, 222, 222, 255)  # color for song title at text area
     text_song_title_stroke_color = (70, 70, 70, 255)
+    arctap_designant_path = './assets/models/tap_tomato.png'
 
     thickness_arc = 10
     thickness_skyline = 2

README.md

@@ -25,17 +25,18 @@ Before using, you need to copy and rename [`theme.py`](./ArcaeaChartRender/theme
 If a property of `BaseTheme` is inherited by one of its subclasses (e.g. `LightTheme`), you should modify the property on its subclass. If the property is not inherited, then you should modify it directly on `BaseTheme`.
 
 | name                              | file                                                                                                                                |
-|-----------------------------------|-------------------------------------------------------------------------------------------------------------------------------------|
+| --------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------- |
 | `font_Exo_SemiBold_XX`            | `Exo-SemiBold.ttf`                                                                                                                  |
 | `font_Kazesawa_Regular_XX`        | `Kazesawa-Regular.ttf`                                                                                                              |
 | `font_SourceHanMonoSC_Regular_XX` | [`SourceHanMonoSC-Regular.otf`](https://github.com/adobe-fonts/source-han-mono/blob/master/Regular/OTC/SourceHanMonoSC-Regular.otf) |
 | `tile_path`                       | `track.png` and `track_dark.png`                                                                                                    |
 | `tap_path`                        | `note.png` and `note_dark.png`                                                                                                      |
 | `hold_path`                       | `note_hold.png` and `note_hold_dark.png`                                                                                            |
 | `arctap_path`                     | `tap_l.png` and `tap_d.png`                                                                                                         |
+| `arctap_designant_path`           | `tap_tomato.png`                                                                                                                    |
 | `arctap_sfx_path`                 | `sfx_l_note.jpg` and `sfx_d_note.jpg`                                                                                               |
 | `default_bg_path`                 | `base_light.jpg` and `base_conflict.jpg`                                                                                            |
-| `custom_bg_dir_path `             | put your custom background here if `bg` field has been defined in songlist                                                          |
+| `custom_bg_dir_path`              | put your custom background here if `bg` field has been defined in songlist                                                          |
 
  > ⚠ Note: <br> This repo does **NOT** provide these assets files, you need to obtain them by yourself. It is recommended to get them at [Arcaea-Infinity/OpenArcaeaArts](https://github.com/Arcaea-Infinity/OpenArcaeaArts) (Licensed under `CC BY-NC`).