From f05ec4da39dbaa51be1142d7611f839c98e738aa Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 21 May 2022 19:15:45 +0200 Subject: [PATCH] feat(yuri): Extend Brian config --- packages/yuri/LICENSE | 21 -------- packages/yuri/config/index.js | 90 +++++------------------------------ packages/yuri/yuri.svg | 53 --------------------- 3 files changed, 12 insertions(+), 152 deletions(-) delete mode 100644 packages/yuri/LICENSE delete mode 100644 packages/yuri/yuri.svg diff --git a/packages/yuri/LICENSE b/packages/yuri/LICENSE deleted file mode 100644 index 207d21dacb0..00000000000 --- a/packages/yuri/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2021 Biou - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/packages/yuri/config/index.js b/packages/yuri/config/index.js index 37b6b2d785b..52915478ee8 100644 --- a/packages/yuri/config/index.js +++ b/packages/yuri/config/index.js @@ -1,6 +1,7 @@ import pkg from '../package.json' +import Brian from '@freesewing/brian' -export default { +const config = { name: 'yuri', version: pkg.version, design: 'Hellgy', @@ -9,51 +10,16 @@ export default { type: 'pattern', difficulty: 3, optionGroups: { - fit: ['bicepsEase', 'chestEase', 'cuffEase', 'collarEase', 'shoulderEase', 'hipsEase'], - style: ['lengthBonus', 'sleeveLengthBonus', 's3Collar', 's3Armhole'], - advanced: [ - 'acrossBackFactor', - 'armholeDepthFactor', - 'backNeckCutout', - 'frontArmholeDeeper', - 'sleeveWidthGuarantee', - { - sleevecap: [ - 'sleevecapEase', - 'sleevecapTopFactorX', - 'sleevecapTopFactorY', - 'sleevecapBackFactorX', - 'sleevecapBackFactorY', - 'sleevecapFrontFactorX', - 'sleevecapFrontFactorY', - 'sleevecapQ1Offset', - 'sleevecapQ2Offset', - 'sleevecapQ3Offset', - 'sleevecapQ4Offset', - 'sleevecapQ1Spread1', - 'sleevecapQ1Spread2', - 'sleevecapQ2Spread1', - 'sleevecapQ2Spread2', - 'sleevecapQ3Spread1', - 'sleevecapQ3Spread2', - 'sleevecapQ4Spread1', - 'sleevecapQ4Spread2', - ], - }, + ...Brian.config.optionGroups, + fit: [ + ...Brian.config.optionGroups.fit, + 'hipsEase' ], }, measurements: [ - 'biceps', - 'chest', + ...Brian.config.measurements, 'head', 'hips', - 'hpsToWaistBack', - 'waistToHips', - 'neck', - 'shoulderSlope', - 'shoulderToShoulder', - 'shoulderToWrist', - 'wrist', 'hpsToBust', ], dependencies: { @@ -79,49 +45,17 @@ export default { hide: ['base', 'sleevecap', 'backBase', 'frontBase', 'sleeveBase'], parts: ['gusset', 'hoodSide', 'hoodCenter'], options: { - // Constants - brianFitSleeve: true, - brianFitCollar: true, - collarFactor: 4.8, - shoulderSlopeReduction: 0, + ...Brian.config.options, - // Options inherited from Brian - acrossBackFactor: { pct: 97, min: 93, max: 100 }, - armholeDepthFactor: { pct: 65, min: 50, max: 70 }, - backNeckCutout: { pct: 5, min: 2, max: 8 }, - bicepsEase: { pct: 8, min: 0, max: 20 }, - chestEase: { pct: 8, min: -4, max: 20 }, + // Brian overrides collarEase: { pct: 20, min: 10, max: 30 }, cuffEase: { pct: 30, min: 20, max: 60 }, - frontArmholeDeeper: { pct: 0.5, min: 0, max: 1.5 }, lengthBonus: { pct: 10, min: 5, max: 15 }, - shoulderEase: { pct: 0.5, min: -2, max: 6 }, - // s3 is short for Shoulder Seam Shift - s3Collar: { pct: 0, min: -100, max: 100 }, - s3Armhole: { pct: 0, min: -100, max: 100 }, sleeveLengthBonus: { pct: 1, min: 0, max: 10 }, - sleevecapEase: { pct: 0, min: 0, max: 10 }, - sleevecapTopFactorX: { pct: 50, min: 25, max: 75 }, - sleevecapTopFactorY: { pct: 100, min: 35, max: 165 }, - sleevecapBackFactorX: { pct: 60, min: 35, max: 65 }, - sleevecapBackFactorY: { pct: 33, min: 30, max: 65 }, - sleevecapFrontFactorX: { pct: 55, min: 35, max: 65 }, - sleevecapFrontFactorY: { pct: 33, min: 30, max: 65 }, - sleevecapQ1Offset: { pct: 3, min: 0, max: 7 }, - sleevecapQ2Offset: { pct: 5.5, min: 0, max: 7 }, - sleevecapQ3Offset: { pct: 4.5, min: 0, max: 7 }, - sleevecapQ4Offset: { pct: 1, min: 0, max: 7 }, - sleevecapQ1Spread1: { pct: 6, min: 4, max: 20 }, - sleevecapQ1Spread2: { pct: 15, min: 4, max: 20 }, - sleevecapQ2Spread1: { pct: 15, min: 4, max: 20 }, - sleevecapQ2Spread2: { pct: 10, min: 4, max: 20 }, - sleevecapQ3Spread1: { pct: 10, min: 4, max: 20 }, - sleevecapQ3Spread2: { pct: 8, min: 4, max: 20 }, - sleevecapQ4Spread1: { pct: 7, min: 4, max: 20 }, - sleevecapQ4Spread2: { pct: 7, min: 4, max: 20 }, - sleeveWidthGuarantee: { pct: 90, min: 25, max: 100 }, - // Options specific to Yuri + // Yuri specific hipsEase: { pct: 0, min: 0, max: 10 }, }, } + +export default config diff --git a/packages/yuri/yuri.svg b/packages/yuri/yuri.svg deleted file mode 100644 index 871245c24e5..00000000000 --- a/packages/yuri/yuri.svg +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -