From ac239c6deddb3085e56f24467d31af598c09abd9 Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Thu, 7 Oct 2021 13:04:47 +0100 Subject: [PATCH 1/5] Tweak svg files --- images/hats/bolt.svg | 2 +- images/hats/crosshairs.svg | 2 +- images/hats/curve.svg | 2 +- images/hats/default.svg | 2 +- images/hats/ex.svg | 2 +- images/hats/eye.svg | 2 +- images/hats/fox.svg | 2 +- images/hats/frame.svg | 2 +- images/hats/hole.svg | 2 +- images/hats/play.svg | 2 +- images/hats/wing.svg | 2 +- src/scripts/preprocessSvgHats.ts | 8 ++++---- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/images/hats/bolt.svg b/images/hats/bolt.svg index 36cc644ad7..eaeb6a1273 100644 --- a/images/hats/bolt.svg +++ b/images/hats/bolt.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/images/hats/crosshairs.svg b/images/hats/crosshairs.svg index 92c39d7bb1..233eeef897 100644 --- a/images/hats/crosshairs.svg +++ b/images/hats/crosshairs.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/images/hats/curve.svg b/images/hats/curve.svg index 873ab578b5..eb39ebe673 100644 --- a/images/hats/curve.svg +++ b/images/hats/curve.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/images/hats/default.svg b/images/hats/default.svg index d69ed38d13..0a479694ea 100644 --- a/images/hats/default.svg +++ b/images/hats/default.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/images/hats/ex.svg b/images/hats/ex.svg index 94543c5808..aa0046de24 100644 --- a/images/hats/ex.svg +++ b/images/hats/ex.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/images/hats/eye.svg b/images/hats/eye.svg index 4e4ba50cf8..4fe4e710cf 100644 --- a/images/hats/eye.svg +++ b/images/hats/eye.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/images/hats/fox.svg b/images/hats/fox.svg index d8211528f8..f5450e4591 100644 --- a/images/hats/fox.svg +++ b/images/hats/fox.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/images/hats/frame.svg b/images/hats/frame.svg index 426660afca..a0961b2e61 100644 --- a/images/hats/frame.svg +++ b/images/hats/frame.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/images/hats/hole.svg b/images/hats/hole.svg index a052980fcf..dd2b42d8a8 100644 --- a/images/hats/hole.svg +++ b/images/hats/hole.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/images/hats/play.svg b/images/hats/play.svg index 431c5b8ade..af1dfc40cd 100644 --- a/images/hats/play.svg +++ b/images/hats/play.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/images/hats/wing.svg b/images/hats/wing.svg index 46d6c2bab4..62043a7fb9 100644 --- a/images/hats/wing.svg +++ b/images/hats/wing.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/scripts/preprocessSvgHats.ts b/src/scripts/preprocessSvgHats.ts index 8e26a82656..22b95fdf77 100644 --- a/src/scripts/preprocessSvgHats.ts +++ b/src/scripts/preprocessSvgHats.ts @@ -15,8 +15,8 @@ async function main() { const rawSvg = await fsp.readFile(filePath, { encoding: "utf8" }); const svgJson = parser.parse(rawSvg, { ignoreAttributes: false }); - svgJson.svg["@_width"] = "0.7em"; - svgJson.svg["@_height"] = "0.7em"; + svgJson.svg["@_width"] = "2em"; + svgJson.svg["@_height"] = "2em"; if ( rawSvg.match(/fill="[^"]+"/) == null && @@ -27,8 +27,8 @@ async function main() { const outputSvg = dumper .parse(svgJson) - .replace(/fill="[^"]+"/, `fill="black"`) - .replace(/fill:[^;]+;/, `fill:black;`); + .replace(/fill="[^"]+"/, `fill="#999999"`) + .replace(/fill:[^;]+;/, `fill:#999999;`); await fsp.writeFile(filePath, outputSvg); }); From 98a3d85f40a17b9cf33041f5584127538336802c Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Thu, 7 Oct 2021 13:26:03 +0100 Subject: [PATCH 2/5] Tweak --- images/hats/bolt.svg | 2 +- images/hats/crosshairs.svg | 2 +- images/hats/curve.svg | 2 +- images/hats/default.svg | 2 +- images/hats/ex.svg | 2 +- images/hats/eye.svg | 2 +- images/hats/fox.svg | 2 +- images/hats/frame.svg | 2 +- images/hats/hole.svg | 2 +- images/hats/play.svg | 2 +- images/hats/wing.svg | 2 +- src/scripts/preprocessSvgHats.ts | 4 ++-- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/images/hats/bolt.svg b/images/hats/bolt.svg index eaeb6a1273..8564b6b3c7 100644 --- a/images/hats/bolt.svg +++ b/images/hats/bolt.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/images/hats/crosshairs.svg b/images/hats/crosshairs.svg index 233eeef897..cc821b86ac 100644 --- a/images/hats/crosshairs.svg +++ b/images/hats/crosshairs.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/images/hats/curve.svg b/images/hats/curve.svg index eb39ebe673..cb1f8bcfd6 100644 --- a/images/hats/curve.svg +++ b/images/hats/curve.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/images/hats/default.svg b/images/hats/default.svg index 0a479694ea..8069c22c42 100644 --- a/images/hats/default.svg +++ b/images/hats/default.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/images/hats/ex.svg b/images/hats/ex.svg index aa0046de24..c20cf65c23 100644 --- a/images/hats/ex.svg +++ b/images/hats/ex.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/images/hats/eye.svg b/images/hats/eye.svg index 4fe4e710cf..b757ec2d83 100644 --- a/images/hats/eye.svg +++ b/images/hats/eye.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/images/hats/fox.svg b/images/hats/fox.svg index f5450e4591..13656ded37 100644 --- a/images/hats/fox.svg +++ b/images/hats/fox.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/images/hats/frame.svg b/images/hats/frame.svg index a0961b2e61..5c307821f3 100644 --- a/images/hats/frame.svg +++ b/images/hats/frame.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/images/hats/hole.svg b/images/hats/hole.svg index dd2b42d8a8..c2c6f03049 100644 --- a/images/hats/hole.svg +++ b/images/hats/hole.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/images/hats/play.svg b/images/hats/play.svg index af1dfc40cd..909ac3b7bf 100644 --- a/images/hats/play.svg +++ b/images/hats/play.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/images/hats/wing.svg b/images/hats/wing.svg index 62043a7fb9..4f1f2a28b6 100644 --- a/images/hats/wing.svg +++ b/images/hats/wing.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/scripts/preprocessSvgHats.ts b/src/scripts/preprocessSvgHats.ts index 22b95fdf77..2b8249eba8 100644 --- a/src/scripts/preprocessSvgHats.ts +++ b/src/scripts/preprocessSvgHats.ts @@ -15,8 +15,8 @@ async function main() { const rawSvg = await fsp.readFile(filePath, { encoding: "utf8" }); const svgJson = parser.parse(rawSvg, { ignoreAttributes: false }); - svgJson.svg["@_width"] = "2em"; - svgJson.svg["@_height"] = "2em"; + svgJson.svg["@_width"] = "1em"; + svgJson.svg["@_height"] = "1em"; if ( rawSvg.match(/fill="[^"]+"/) == null && From d3bddaff396cacb2f086b337019d8930bb593c06 Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Thu, 7 Oct 2021 13:28:32 +0100 Subject: [PATCH 3/5] More tweaks --- images/hats/bolt.svg | 2 +- images/hats/crosshairs.svg | 2 +- images/hats/curve.svg | 2 +- images/hats/default.svg | 2 +- images/hats/ex.svg | 2 +- images/hats/eye.svg | 2 +- images/hats/fox.svg | 2 +- images/hats/frame.svg | 2 +- images/hats/hole.svg | 2 +- images/hats/play.svg | 2 +- images/hats/wing.svg | 2 +- src/scripts/preprocessSvgHats.ts | 4 ++-- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/images/hats/bolt.svg b/images/hats/bolt.svg index 8564b6b3c7..bf6f63eea3 100644 --- a/images/hats/bolt.svg +++ b/images/hats/bolt.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/images/hats/crosshairs.svg b/images/hats/crosshairs.svg index cc821b86ac..5103091a7c 100644 --- a/images/hats/crosshairs.svg +++ b/images/hats/crosshairs.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/images/hats/curve.svg b/images/hats/curve.svg index cb1f8bcfd6..1a32d16351 100644 --- a/images/hats/curve.svg +++ b/images/hats/curve.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/images/hats/default.svg b/images/hats/default.svg index 8069c22c42..9c045affb8 100644 --- a/images/hats/default.svg +++ b/images/hats/default.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/images/hats/ex.svg b/images/hats/ex.svg index c20cf65c23..487f4ec0f1 100644 --- a/images/hats/ex.svg +++ b/images/hats/ex.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/images/hats/eye.svg b/images/hats/eye.svg index b757ec2d83..b102de335f 100644 --- a/images/hats/eye.svg +++ b/images/hats/eye.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/images/hats/fox.svg b/images/hats/fox.svg index 13656ded37..a50c14c01d 100644 --- a/images/hats/fox.svg +++ b/images/hats/fox.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/images/hats/frame.svg b/images/hats/frame.svg index 5c307821f3..e66e07d54c 100644 --- a/images/hats/frame.svg +++ b/images/hats/frame.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/images/hats/hole.svg b/images/hats/hole.svg index c2c6f03049..8525f13915 100644 --- a/images/hats/hole.svg +++ b/images/hats/hole.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/images/hats/play.svg b/images/hats/play.svg index 909ac3b7bf..c167a8a38b 100644 --- a/images/hats/play.svg +++ b/images/hats/play.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/images/hats/wing.svg b/images/hats/wing.svg index 4f1f2a28b6..ac5ef5049b 100644 --- a/images/hats/wing.svg +++ b/images/hats/wing.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/scripts/preprocessSvgHats.ts b/src/scripts/preprocessSvgHats.ts index 2b8249eba8..e0a3625171 100644 --- a/src/scripts/preprocessSvgHats.ts +++ b/src/scripts/preprocessSvgHats.ts @@ -27,8 +27,8 @@ async function main() { const outputSvg = dumper .parse(svgJson) - .replace(/fill="[^"]+"/, `fill="#999999"`) - .replace(/fill:[^;]+;/, `fill:#999999;`); + .replace(/fill="[^"]+"/, `fill="#777777"`) + .replace(/fill:[^;]+;/, `fill:#777777;`); await fsp.writeFile(filePath, outputSvg); }); From cf47bc34a0ad99ae8d64cf8227f600a2c49e5f8d Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Thu, 7 Oct 2021 13:38:51 +0100 Subject: [PATCH 4/5] whatever --- images/hats/bolt.svg | 2 +- images/hats/crosshairs.svg | 2 +- images/hats/curve.svg | 2 +- images/hats/default.svg | 2 +- images/hats/ex.svg | 2 +- images/hats/eye.svg | 2 +- images/hats/fox.svg | 2 +- images/hats/frame.svg | 2 +- images/hats/hole.svg | 2 +- images/hats/play.svg | 2 +- images/hats/wing.svg | 2 +- src/scripts/preprocessSvgHats.ts | 4 ++-- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/images/hats/bolt.svg b/images/hats/bolt.svg index bf6f63eea3..7f2c1694b5 100644 --- a/images/hats/bolt.svg +++ b/images/hats/bolt.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/images/hats/crosshairs.svg b/images/hats/crosshairs.svg index 5103091a7c..72e7e51883 100644 --- a/images/hats/crosshairs.svg +++ b/images/hats/crosshairs.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/images/hats/curve.svg b/images/hats/curve.svg index 1a32d16351..d113b898b5 100644 --- a/images/hats/curve.svg +++ b/images/hats/curve.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/images/hats/default.svg b/images/hats/default.svg index 9c045affb8..23a88995ac 100644 --- a/images/hats/default.svg +++ b/images/hats/default.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/images/hats/ex.svg b/images/hats/ex.svg index 487f4ec0f1..5cb7a01e1f 100644 --- a/images/hats/ex.svg +++ b/images/hats/ex.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/images/hats/eye.svg b/images/hats/eye.svg index b102de335f..38760c1f43 100644 --- a/images/hats/eye.svg +++ b/images/hats/eye.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/images/hats/fox.svg b/images/hats/fox.svg index a50c14c01d..70e6c835e1 100644 --- a/images/hats/fox.svg +++ b/images/hats/fox.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/images/hats/frame.svg b/images/hats/frame.svg index e66e07d54c..78e2ff9daf 100644 --- a/images/hats/frame.svg +++ b/images/hats/frame.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/images/hats/hole.svg b/images/hats/hole.svg index 8525f13915..70f4fcd8c3 100644 --- a/images/hats/hole.svg +++ b/images/hats/hole.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/images/hats/play.svg b/images/hats/play.svg index c167a8a38b..a51e1a7821 100644 --- a/images/hats/play.svg +++ b/images/hats/play.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/images/hats/wing.svg b/images/hats/wing.svg index ac5ef5049b..4853ea9418 100644 --- a/images/hats/wing.svg +++ b/images/hats/wing.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/scripts/preprocessSvgHats.ts b/src/scripts/preprocessSvgHats.ts index e0a3625171..4ae4615786 100644 --- a/src/scripts/preprocessSvgHats.ts +++ b/src/scripts/preprocessSvgHats.ts @@ -27,8 +27,8 @@ async function main() { const outputSvg = dumper .parse(svgJson) - .replace(/fill="[^"]+"/, `fill="#777777"`) - .replace(/fill:[^;]+;/, `fill:#777777;`); + .replace(/fill="[^"]+"/, `fill="currentColor"`) + .replace(/fill:[^;]+;/, `fill:currentColor;`); await fsp.writeFile(filePath, outputSvg); }); From 1d016bae16dc8f7ef9d213e8cd84ec506464d0a7 Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Thu, 7 Oct 2021 13:42:09 +0100 Subject: [PATCH 5/5] whatever --- images/hats/bolt.svg | 2 +- images/hats/crosshairs.svg | 2 +- images/hats/curve.svg | 2 +- images/hats/default.svg | 2 +- images/hats/ex.svg | 2 +- images/hats/eye.svg | 2 +- images/hats/fox.svg | 2 +- images/hats/frame.svg | 2 +- images/hats/hole.svg | 2 +- images/hats/play.svg | 2 +- images/hats/wing.svg | 2 +- src/scripts/preprocessSvgHats.ts | 4 ++-- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/images/hats/bolt.svg b/images/hats/bolt.svg index 7f2c1694b5..8ea6cf31a3 100644 --- a/images/hats/bolt.svg +++ b/images/hats/bolt.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/images/hats/crosshairs.svg b/images/hats/crosshairs.svg index 72e7e51883..98b1cd34b9 100644 --- a/images/hats/crosshairs.svg +++ b/images/hats/crosshairs.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/images/hats/curve.svg b/images/hats/curve.svg index d113b898b5..80ea103572 100644 --- a/images/hats/curve.svg +++ b/images/hats/curve.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/images/hats/default.svg b/images/hats/default.svg index 23a88995ac..6ad5b1e7aa 100644 --- a/images/hats/default.svg +++ b/images/hats/default.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/images/hats/ex.svg b/images/hats/ex.svg index 5cb7a01e1f..a926865fed 100644 --- a/images/hats/ex.svg +++ b/images/hats/ex.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/images/hats/eye.svg b/images/hats/eye.svg index 38760c1f43..559d25edba 100644 --- a/images/hats/eye.svg +++ b/images/hats/eye.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/images/hats/fox.svg b/images/hats/fox.svg index 70e6c835e1..98cdf160c3 100644 --- a/images/hats/fox.svg +++ b/images/hats/fox.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/images/hats/frame.svg b/images/hats/frame.svg index 78e2ff9daf..fa84d617a1 100644 --- a/images/hats/frame.svg +++ b/images/hats/frame.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/images/hats/hole.svg b/images/hats/hole.svg index 70f4fcd8c3..be0aff7f1d 100644 --- a/images/hats/hole.svg +++ b/images/hats/hole.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/images/hats/play.svg b/images/hats/play.svg index a51e1a7821..279c95364c 100644 --- a/images/hats/play.svg +++ b/images/hats/play.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/images/hats/wing.svg b/images/hats/wing.svg index 4853ea9418..3d3f73afbe 100644 --- a/images/hats/wing.svg +++ b/images/hats/wing.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/scripts/preprocessSvgHats.ts b/src/scripts/preprocessSvgHats.ts index 4ae4615786..4779b41928 100644 --- a/src/scripts/preprocessSvgHats.ts +++ b/src/scripts/preprocessSvgHats.ts @@ -27,8 +27,8 @@ async function main() { const outputSvg = dumper .parse(svgJson) - .replace(/fill="[^"]+"/, `fill="currentColor"`) - .replace(/fill:[^;]+;/, `fill:currentColor;`); + .replace(/fill="[^"]+"/, `fill="#666666"`) + .replace(/fill:[^;]+;/, `fill:#666666;`); await fsp.writeFile(filePath, outputSvg); });