iOS 16

PoomSmart · Feb 17, 2023 · e8595c1 · e8595c1
1 parent 9ae6b8b
commit e8595c1
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 16 deletions.
diff --git a/apple.sh b/apple.sh
@@ -31,11 +31,10 @@ then
 fi
 
 echo "Optimizing PNGs..."
-[[ $HD == true ]] && pngquant --skip-if-larger -f --ext .png $ASSETS/160/*.png &
-pngquant --skip-if-larger $COLORS -f --ext .png $ASSETS/96/*.png &
-pngquant --skip-if-larger $COLORS -f --ext .png $ASSETS/64/*.png &
-pngquant --skip-if-larger $COLORS -f --ext .png $ASSETS/40/*.png &
-wait
+[[ $HD == true ]] && pngquant --skip-if-larger -f --ext .png $ASSETS/160/*.png || true
+pngquant --skip-if-larger $COLORS -f --ext .png $ASSETS/96/*.png || true
+pngquant --skip-if-larger $COLORS -f --ext .png $ASSETS/64/*.png || true
+pngquant --skip-if-larger $COLORS -f --ext .png $ASSETS/40/*.png || true
 
 [[ $HD == true ]] && oxipng -q $ASSETS/160/*.png &
 oxipng -q $ASSETS/96/*.png &

diff --git a/blobmoji/blobmoji.sh b/blobmoji/blobmoji.sh
@@ -23,7 +23,7 @@ mogrify -resize 96x96 -path images/96 bitmaps/strike0/*.png
 ../resize.sh false false false
 rm -rf bitmaps
 
-cd $NAME-extra
+cd extra
 rm -rf svgs images
 mkdir -p svgs images/96 images/64 images/48 images/40 images/32 images/20
 python3 gen-couple-heart.py
@@ -33,9 +33,8 @@ python3 gen-handshake.py
 for svg in $(find ./svgs -type f -name '*.svg')
 do
     fname=$(basename $svg)
-    rsvg-convert -a -h $MAX_SIZE $svg -o images/$MAX_SIZE/${fname/.svg/.png} &
+    rsvg-convert -a -h $MAX_SIZE $svg -o images/$MAX_SIZE/${fname/.svg/.png}
 done
-wait
 ../../resize.sh false false false
 cd ..
 

diff --git a/emjc.py b/emjc.py
@@ -121,9 +121,9 @@ def decode_emjc(emjc_data: bytes):
                 g = base + (q + 1) // 2
                 b = base - p // 2 - q // 2
 
-            dst_buffer[i * 4 + 0] = (b % 257) + 257 if b < 0 else (b % 257)
-            dst_buffer[i * 4 + 1] = (g % 257) + 257 if g < 0 else (g % 257)
-            dst_buffer[i * 4 + 2] = (r % 257) + 257 if r < 0 else (r % 257)
+            dst_buffer[i * 4 + 0] = (b % 257) + 257 if b < 0 else b % 257
+            dst_buffer[i * 4 + 1] = (g % 257) + 257 if g < 0 else g % 257
+            dst_buffer[i * 4 + 2] = (r % 257) + 257 if r < 0 else r % 257
             dst_buffer[i * 4 + 3] = alpha[i]
             i += 1
 

diff --git a/noto-emoji/noto-emoji.sh b/noto-emoji/noto-emoji.sh
@@ -18,15 +18,13 @@ echo "Converting SVGs into PNGs..."
 for svg in $(find $ASSETS -type f -name '*.svg')
 do
     fname=$(basename $svg)
-    rsvg-convert -a -h $MAX_SIZE $svg -o images/$MAX_SIZE/${fname/.svg/.png} &
+    rsvg-convert -a -h $MAX_SIZE $svg -o images/$MAX_SIZE/${fname/.svg/.png}
 done
-wait
 for svg in $(find $FLAG_ASSETS -type f -name '*.svg')
 do
     fname=$(basename $svg)
-    rsvg-convert -a -h $MAX_SIZE $svg -o images/$MAX_SIZE/${fname/.svg/.png} &
+    rsvg-convert -a -h $MAX_SIZE $svg -o images/$MAX_SIZE/${fname/.svg/.png}
 done
-wait
 
 cd extra
 rm -rf svgs images

diff --git a/prepare.sh b/prepare.sh
@@ -6,6 +6,7 @@ IOS_FONT_NAME=AppleColorEmoji_iOS
 WORK_DIR=common
 
 mkdir -p $WORK_DIR
+rm -f *.ttx
 
 echo "Extracting font..."
 otc2otf $IOS_FONT_NAME.ttc

diff --git a/resize.sh b/resize.sh
@@ -7,7 +7,6 @@ FULL=$2
 [[ $3 = true ]] && COLORS=256 || COLORS=
 
 if [[ $HD = true ]]; then
-    mogrify -resize 160x160 images/160/*.png
     pngquant --skip-if-larger $COLORS -f --ext .png images/160/*.png &
     mogrify -resize 96x96 -path images/96 images/160/*.png
     pngquant --skip-if-larger $COLORS -f --ext .png images/96/*.png &

diff --git a/shared.py b/shared.py
@@ -228,6 +228,8 @@ def base_norm_special(name: str, with_variant_selector = False):
         return '1f408_200d_2b1b'
     if name == '1f415_1f9ba':
         return '1f415_200d_1f9ba'
+    if name == '1f426_2b1b':
+        return '1f426_200d_2b1b'
     if name == '1f441_1f5e8':
         return '1f441_200d_1f5e8'
     if name == '1f62e_1f4a8':