Rename ImagePack MaskParam Enum names

PrepPipe · Dec 28, 2024 · 0a47cd4 · 0a47cd4
1 parent 25efe32
commit 0a47cd4
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/assets/imagepack/background/A0-考拉Koala/T_references_common.yml b/assets/imagepack/background/A0-考拉Koala/T_references_common.yml
@@ -1,7 +1,7 @@
 kind: BACKGROUND
 masks:
   - BACKGROUND_SCREEN
-  - BACKGROUND_COLOR_1
+  - BACKGROUND_COLOR_INDICATOR
 composites:
   L0:
     en: "Daytime"

diff --git a/src/preppipe/frontend/vnmodel/vnutil.py b/src/preppipe/frontend/vnmodel/vnutil.py
@@ -275,7 +275,7 @@ def handle_imagepreset_background_expr(template : str, *, composite : str = '',
     if screen is not None:
       rawargs[ImagePackDescriptor.MaskType.BACKGROUND_SCREEN] = screen
     if indicator is not None:
-      rawargs[ImagePackDescriptor.MaskType.BACKGROUND_COLOR_1] = indicator
+      rawargs[ImagePackDescriptor.MaskType.BACKGROUND_COLOR_INDICATOR] = indicator
     converted_args = _helper_prepare_fork_arguments(descriptor, rawargs)
     # ImagePackElementLiteralExpr 支持从 ImagePackDescriptor 直接读取图片大小等信息
     resolution_v = resolution.resolution if resolution is not None else None
@@ -285,11 +285,11 @@ def handle_imagepreset_character_expr(template : str, *, composite : str = '', c
     descriptor = _helper_get_descriptor(template, ImagePackDescriptor.ImagePackType.CHARACTER, "character-A0-T0")
     rawargs = {}
     if cloth is not None:
-      rawargs[ImagePackDescriptor.MaskType.CHARACTER_COLOR_1] = cloth
+      rawargs[ImagePackDescriptor.MaskType.CHARACTER_COLOR_CLOTH] = cloth
     if hair is not None:
-      rawargs[ImagePackDescriptor.MaskType.CHARACTER_COLOR_2] = hair
+      rawargs[ImagePackDescriptor.MaskType.CHARACTER_COLOR_HAIR] = hair
     if decorate is not None:
-      rawargs[ImagePackDescriptor.MaskType.CHARACTER_COLOR_3] = decorate
+      rawargs[ImagePackDescriptor.MaskType.CHARACTER_COLOR_DECORATE] = decorate
     converted_args = _helper_prepare_fork_arguments(descriptor, rawargs)
     resolution_v = resolution.resolution if resolution is not None else None
     return _helper_finalize_imagepreset_expr(descriptor, composite, converted_args, resolution_v)
@@ -301,17 +301,17 @@ def handle_imagepreset_character_expr(template : str, *, composite : str = '', c
         'template': _tr_template,
         'composite': _tr_composite_name,
         'screen': ImagePackDescriptor.MaskType.BACKGROUND_SCREEN.trname,
-        'indicator': ImagePackDescriptor.MaskType.BACKGROUND_COLOR_1.trname,
+        'indicator': ImagePackDescriptor.MaskType.BACKGROUND_COLOR_INDICATOR.trname,
         'resolution': _tr_resolution
       }))
   elif placeholderdest == ImageExprPlaceholderDest.DEST_CHARACTER_SPRITE:
     candidates_from_preset.append(([_tr_imagepreset, _tr_imagepreset_character],
       handle_imagepreset_character_expr, {
         'template': _tr_template,
         'composite': _tr_composite_name,
-        'cloth': ImagePackDescriptor.MaskType.CHARACTER_COLOR_1.trname,
-        'hair': ImagePackDescriptor.MaskType.CHARACTER_COLOR_2.trname,
-        'decorate': ImagePackDescriptor.MaskType.CHARACTER_COLOR_3.trname,
+        'cloth': ImagePackDescriptor.MaskType.CHARACTER_COLOR_CLOTH.trname,
+        'hair': ImagePackDescriptor.MaskType.CHARACTER_COLOR_HAIR.trname,
+        'decorate': ImagePackDescriptor.MaskType.CHARACTER_COLOR_DECORATE.trname,
         'resolution': _tr_resolution
       }))
 

diff --git a/src/preppipe/util/imagepack.py b/src/preppipe/util/imagepack.py
@@ -2440,22 +2440,22 @@ class MaskType(enum.Enum):
       zh_cn="屏幕",
       zh_hk="屏幕",
     )
-    BACKGROUND_COLOR_1 = enum.auto(), ImagePack.TR_imagepack.tr("maskparam_color_indicator",
+    BACKGROUND_COLOR_INDICATOR = enum.auto(), ImagePack.TR_imagepack.tr("maskparam_color_indicator",
       en="IndicatorColor",
       zh_cn="指示色",
       zh_hk="指示色",
     )
-    CHARACTER_COLOR_1 = enum.auto(), ImagePack.TR_imagepack.tr("maskparam_color_cloth",
+    CHARACTER_COLOR_CLOTH = enum.auto(), ImagePack.TR_imagepack.tr("maskparam_color_cloth",
       en="ClothColor",
       zh_cn="衣服颜色",
       zh_hk="衣服顏色",
     )
-    CHARACTER_COLOR_2 = enum.auto(), ImagePack.TR_imagepack.tr("maskparam_color_hair",
+    CHARACTER_COLOR_HAIR = enum.auto(), ImagePack.TR_imagepack.tr("maskparam_color_hair",
       en="HairColor",
       zh_cn="发色",
       zh_hk="髮色",
     )
-    CHARACTER_COLOR_3 = enum.auto(), ImagePack.TR_imagepack.tr("maskparam_color_decorate",
+    CHARACTER_COLOR_DECORATE = enum.auto(), ImagePack.TR_imagepack.tr("maskparam_color_decorate",
       en="DecorateColor",
       zh_cn="装饰色",
       zh_hk="裝飾色",
@@ -2625,17 +2625,17 @@ def __init__(self, pack : ImagePack, pack_name : str, references_path : str, pac
         if mask.projective_vertices is not None:
           masktypelist.append(ImagePackDescriptor.MaskType.BACKGROUND_SCREEN)
         else:
-          masktypelist.append(ImagePackDescriptor.MaskType.BACKGROUND_COLOR_1)
+          masktypelist.append(ImagePackDescriptor.MaskType.BACKGROUND_COLOR_INDICATOR)
     else:
       self.packtype = ImagePackDescriptor.ImagePackType.CHARACTER
       for mask in pack.masks:
         match len(masktypelist):
           case 0:
-            masktypelist.append(ImagePackDescriptor.MaskType.CHARACTER_COLOR_1)
+            masktypelist.append(ImagePackDescriptor.MaskType.CHARACTER_COLOR_CLOTH)
           case 1:
-            masktypelist.append(ImagePackDescriptor.MaskType.CHARACTER_COLOR_2)
+            masktypelist.append(ImagePackDescriptor.MaskType.CHARACTER_COLOR_HAIR)
           case _:
-            masktypelist.append(ImagePackDescriptor.MaskType.CHARACTER_COLOR_3)
+            masktypelist.append(ImagePackDescriptor.MaskType.CHARACTER_COLOR_DECORATE)
     self.masktypes = tuple(masktypelist)
     # 从图片包组合的名称中提取编号
     regex_pattern = re.compile(r'^(?P<code>[A-Z0-9]+)(?:-.+)?$')